diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2006-10-27 12:06:13 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2006-10-27 12:06:13 +0000 |
| commit | 826b6112902fdf4fe76b9026c16c5fb9237979b8 (patch) | |
| tree | b080cdb38b9d177f5282db80be08fc4a962ee868 /packaging/nsis | |
| parent | 315327f79d59b63aa9a9c2398a133d5d945dbea7 (diff) | |
| download | wireshark-826b6112902fdf4fe76b9026c16c5fb9237979b8.tar.gz | |
fix the GTK-WIMP paths for GTK2.8 - both source and destination paths completely changed from 2.6 to 2.8 due to the integration of Wimp into the main GTK repository
remove settings for GTK2.2 and 2.4 in config.nmake - as no one uses it IMHO
svn path=/trunk/; revision=19715
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 5 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 84f4c40a25..55bd4e76d0 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -124,7 +124,10 @@ $(DEST)-setup-$(VERSION).exe : $(NSI) $(DELIVERABLES) Makefile.nmake !ENDIF !IFDEF GTK_WIMP_DIR /DGTK_WIMP_DIR=$(GTK_WIMP_DIR) \ - /DGTK_THEME_DIR=$(GTK_THEME_DIR) \ + /DGTK_WIMP_DLLDST_DIR=$(GTK_WIMP_DLLDST_DIR) \ + /DGTK_WIMP_DLLSRC_DIR=$(GTK_WIMP_DLLSRC_DIR) \ + /DGTK_WIMP_RCDST_DIR=$(GTK_WIMP_RCDST_DIR) \ + /DGTK_WIMP_RCSRC_DIR=$(GTK_WIMP_RCSRC_DIR) \ !ENDIF /DGLIB_DIR=$(GLIB_DIR) \ /DICONV_DIR=$(ICONV_DIR) \ diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index fac1f8402c..41a8abf44e 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -675,14 +675,10 @@ SectionEnd Section "GTK-Wimp" SecGTKWimp ;------------------------------------------- SectionIn 1 -SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_LIB_DIR}\engines -File "${GTK_WIMP_DIR}\libwimp.dll" -; GTK+ 2.8 looks for themes in "etc". We should really pick one -; directory and install there. -SetOutPath $INSTDIR\share\themes\Default\gtk-2.0 -File "${GTK_THEME_DIR}\gtkrc" -SetOutPath $INSTDIR\etc\gtk-2.0 -File "${GTK_THEME_DIR}\gtkrc" +SetOutPath $INSTDIR\${GTK_WIMP_DLLDST_DIR} +File "${GTK_WIMP_DLLSRC_DIR}\libwimp.dll" +SetOutPath $INSTDIR\${GTK_WIMP_RCDST_DIR} +File "${GTK_WIMP_RCSRC_DIR}\gtkrc" SectionEnd !endif !endif |