diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2008-01-08 08:07:45 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2008-01-08 08:07:45 +0000 |
| commit | c0dc9306893bf6af75eab1a0a9e7712854149670 (patch) | |
| tree | 7d5f2b0ccbc9a69907e89ec98dc79f1a8690fcc8 /packaging | |
| parent | 785913fff3fa8a6cd7c2f0725183be1349fae360 (diff) | |
Graeme Lunt:
(The fix is to cd back to "../portableapps/win32", rather than
"../u3/win32", at the end of the nsis-bits target in makefile.nmake.)
Me:
Get rid of some whitespace at the end of lines.
svn path=/trunk/; revision=24031
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/portableapps/win32/makefile.nmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake index 220403138d..7958054465 100644 --- a/packaging/portableapps/win32/makefile.nmake +++ b/packaging/portableapps/win32/makefile.nmake @@ -30,7 +30,7 @@ UPX_FLAGS = -q PAPPS_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).0 -all: package +all: package package: WiresharkPortable-$(VERSION).paf.exe @@ -46,7 +46,7 @@ dirs: nsis-bits: cd ../../nsis $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake user-guide.chm NEWS.txt - cd ../u3/win32 + cd ../portableapps/win32 $(WSMANIFEST): cd ../.. @@ -79,7 +79,7 @@ appinfo: appinfo.ini $(COPY) appinfo.ini $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS) $(COPY) $(TOPDIR)\image\wireshark.ico $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS) -source: +source: $(COPY) WiresharkPortable.ini $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) $(COPY) WiresharkPortable.nsi $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) $(COPY) Installer.nsi $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) @@ -89,7 +89,7 @@ findprocdll: @$(SH) $(TOPDIR)\tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(MAKENSIS)\.." \ Plugins FindProc.zip -WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/WiresharkPortable.exe Installer.nsi +WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/WiresharkPortable.exe Installer.nsi $(MAKENSIS) \ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ |