From b5e5d6ac35c92780c939e657c686c5a8b247d053 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Wed, 13 Jun 2012 22:28:28 +0000
Subject: Don't add uninstall.exe to the U3/PortableApps manifest. Define
 STAGING_DIR. Update some makefile dependencies.

svn path=/trunk/; revision=43244
---
 packaging/portableapps/win32/Makefile.nmake | 2 +-
 packaging/portableapps/win32/makenmake.pl   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'packaging/portableapps/win32')

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 = <>) {
     
-- 
cgit v1.2.3