diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2007-01-18 17:41:47 +0000 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2007-01-18 17:41:47 +0000 |
| commit | e7f88bde995f4eb2f43c43bff5bc71fdc14710be (patch) | |
| tree | d0087c6fdde8f804c7cf65cee7e7a195f6e991f8 | |
| parent | 6af6a4d2e9e27167a51792b79e71c4e3b55f021c (diff) | |
| download | pidgin-e7f88bde995f4eb2f43c43bff5bc71fdc14710be.tar.gz | |
[gaim-migrate @ 18156]
Have the wingaim installer read the GTK version to be installed from the installer "source" instead of maintaining the version in the installer script and having to update it.
| -rw-r--r-- | Makefile.mingw | 11 | ||||
| -rw-r--r-- | gaim-installer.nsi | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.mingw b/Makefile.mingw index a12ef0437d..f9323c4b29 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -31,6 +31,11 @@ awk 'BEGIN {FS="."} { \ exit; \ }' VERSION) +GTK_INSTALL_VERSION = $(shell \ + source ../gtk_installer/version.sh; \ + echo $$gtk_version \ +) + # Any *.dll or *.exe files included in win32-install-dir that we don't compile # should be included in this list so they don't get stripped NON_GAIM_DLLS = \ @@ -70,13 +75,13 @@ create_release_install_dir: install -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec strip --strip-unneeded {} ';' installer: create_release_install_dir - $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi + $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installer_nogtk: create_release_install_dir - $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi + $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installer_debug: install - $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG gaim-installer.nsi + $(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi installers: installer installer_nogtk installer_debug diff --git a/gaim-installer.nsi b/gaim-installer.nsi index b4a32ee66a..3531ae7340 100644 --- a/gaim-installer.nsi +++ b/gaim-installer.nsi @@ -64,7 +64,6 @@ SetDateSave on !define GAIM_UNINST_EXE "gaim-uninst.exe" !define GTK_MIN_VERSION "2.6.10" -!define GTK_INSTALL_VERSION "2.10.6" !define GTK_REG_KEY "SOFTWARE\GTK\2.0" !define PERL_REG_KEY "SOFTWARE\Perl" !define PERL_DLL "perl58.dll" |