diff options
Diffstat (limited to 'packaging/portableapps')
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 2 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/makenmake.pl | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index de90f8e157..ec4063cdba 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -54,7 +54,7 @@ $(WSMANIFEST): $(MAKE) /$(MAKEFLAGS) -f makefile.nmake wireshark.manifest cd portableapps/win32 -distribution.nmake: $(WSMANIFEST) makenmake.pl +distribution.nmake: makenmake.pl $(WSMANIFEST) ../../ws-manifest.pl $(PERL) makenmake.pl $(WSMANIFEST) > $@ distribution: distribution.nmake diff --git a/packaging/portableapps/win32/makenmake.pl b/packaging/portableapps/win32/makenmake.pl index f9bb348331..f96dda78c2 100755 --- a/packaging/portableapps/win32/makenmake.pl +++ b/packaging/portableapps/win32/makenmake.pl @@ -3,7 +3,7 @@ # $Id$ # -print " +print q{ include ../../../config.nmake include <win32.mak> @@ -11,14 +11,15 @@ FILES = Files APP = App WIRESHARK = Wireshark -TOPDIR = ..\\..\\.. +TOPDIR = ..\..\.. +STAGING_DIR = $(TOPDIR)\$(INSTALL_DIR) COPY = xcopy MOVE = mv MKDIR = mkdir COPY_FLAGS = /d /y distribution: -"; +}; while($line = <>) { |