Try to fix tarball compilation on Windows.

svn path=/trunk/; revision=43428

diff --git a/Makefile.nmake b/Makefile.nmake
index 007f7d55cacd4f8a89705acb504fd4a12aeb3677..10b3652309374f530ed4f0deb2a6bbc9916819e7 100644 (file)
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1085,8 +1085,6 @@ install-generated-files:
        cd plugins
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-plugins
        cd ..
-       if not exist $(INSTALL_DIR)\ui mkdir $(INSTALL_DIR)\ui
-       xcopy "ui\gtk\ui\*.xml" $(INSTALL_DIR)\ui /d
 
 # "install-all" will copy all files needed to run Wireshark/Tshark
 # to the INSTALL_DIR, so you can run/debug Wireshark/Tshark from there.

diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index 6004987327ff4f4052fd28dd38a1afaceb754849..4669934aade143987e89bda6f42642587438d070 100644 (file)
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -5,6 +5,8 @@ MAINTAINERCLEANFILES = \
 
 EXTRA_DIST = \
        wireshark.nsi   \
+       uninstall.nsi   \
+       common.nsh      \
        GetWindowsVersion.nsh \
        servicelib.nsh \
        VersionCompare.nsh \