From Ulf Lamping: add some missing "cd .."s. (I guess the current

directory in nmake files persists across targets; presumably all
commands, or, at least, all "cd" commands, are run in the same process.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8682 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 9c8fa59ad4b0433c93c7a98f2ff12b44bc1fedde..0fc102c36542909e1db6c3bdbdc45e821bb63760 100644 (file)
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.30 2003/10/10 21:31:47 guy Exp $
+# $Id: Makefile.nmake,v 1.31 2003/10/13 19:04:55 guy Exp $
 
 include ..\config.nmake
 
@@ -64,6 +64,7 @@ clean:
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../dfilter
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ..
 
 distclean: clean
        rm -f config.h
@@ -71,6 +72,7 @@ distclean: clean
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ../dfilter
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+       cd ..
 
 ftypes:: config.h
        cd ftypes

diff --git a/tools/Makefile.nmake b/tools/Makefile.nmake
index 55055337a06f55b1ab604e0e460adee3df3f9b77..876f8aae0f44f0bb9b3d3df5331e408abef8bcd5 100755 (executable)
--- a/tools/Makefile.nmake
+++ b/tools/Makefile.nmake
@@ -1,17 +1,19 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.4 2003/10/10 21:31:53 guy Exp $
+# $Id: Makefile.nmake,v 1.5 2003/10/13 19:04:56 guy Exp $
 
 all: lemon
 
 clean:
        cd lemon
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ..
 
 distclean: clean
        cd lemon
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+       cd ..
 
 lemon::
        cd lemon