diff options
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 4956c89c75..a400e75f80 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -127,6 +127,7 @@ $(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) \ !ENDIF /DGLIB_DIR=$(GLIB_DIR) \ /DICONV_DIR=$(ICONV_DIR) \ diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index c46a995465..92d2d1f448 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -644,8 +644,12 @@ 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_WIMP_DIR}\Theme\gtk-2.0\gtkrc" +File "${GTK_THEME_DIR}\gtkrc" +SetOutPath $INSTDIR\etc\gtk-2.0 +File "${GTK_THEME_DIR}\gtkrc" SectionEnd !endif !endif |