aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.nmake
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-04-10 08:00:17 -0700
committerGerald Combs <gerald@wireshark.org>2015-04-10 17:16:21 +0000
commitfd72024bc27cdc073b5659415851a4f3d26efe22 (patch)
treed9e6237d7dea7b6bf061bd927dcac341221a1f63 /Makefile.nmake
parent1785d4206111dcbd0ef7ced3a1aad55da76c7b91 (diff)
Move the PortabaleApps packaging up one level.
Update the PA section of the Developer's Guide. Change-Id: I383d2a2405e742eb353390f5a43fd6d6d32cb25b Reviewed-on: https://code.wireshark.org/review/8012 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'Makefile.nmake')
-rw-r--r--Makefile.nmake14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index a66ece3279..507cfa7d2b 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -236,11 +236,9 @@ packaging: _FORCE_
packaging_papps: all
cd packaging
cd portableapps
- cd win32
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
cd ..
- cd ..
# use (info-)zip from cygwin to pack things
packaging_zip: all
@@ -617,9 +615,9 @@ clean: clean-local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
cd ../packaging/nsis
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
- cd ../portableapps/win32
+ cd ../portableapps
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
- cd ../../..
+ cd ../..
# "distclean" removes all files not part of the distribution.
# It does not remove generated files that are part of the distribution.
@@ -673,9 +671,9 @@ distclean: distclean-local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
cd ../packaging/nsis
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
- cd ../portableapps/win32
+ cd ../portableapps
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
- cd ../../..
+ cd ../..
# Make "maintainer-clean" only if you would like to remove ALL generated
# files.
@@ -722,9 +720,9 @@ maintainer-clean: maintainer-clean-local
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
cd ../packaging/nsis
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
- cd ../portableapps/win32
+ cd ../portableapps
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
- cd ../../..
+ cd ../..
tools::
cd tools