diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-06-21 17:35:59 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-06-21 17:35:59 +0000 |
commit | 1785ed1ee02003f9806ca0a1f918141a551ffe0d (patch) | |
tree | bea1dff03047409c3a373c2026f3132e2bd1b749 | |
parent | 3685b4db6f77fbbbe6c49fe2766156c037a44cc3 (diff) |
Try to fix tarball compilation on Windows.
svn path=/trunk/; revision=43428
-rw-r--r-- | Makefile.nmake | 2 | ||||
-rw-r--r-- | packaging/nsis/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 007f7d55ca..10b3652309 100644 --- 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 6004987327..4669934aad 100644 --- 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 \ |