From: sandeep <sandeep@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sat, 29 Jan 2000 23:09:01 +0000 (+0000)
Subject: Build related changes (don't know why it did not commit
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=82b96d369ade249d725555ab4b27dd096cf3f813;p=fw%2Fsdcc

Build related changes (don't know why it did not commit
the first time)


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@40 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/Makefile b/Makefile
index 87aaac95..c2b0e503 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,8 @@ all: checkconf
 install:
 	$(MAKE) -f main.mk install
 	@for pkg in $(PKGS); do\
-	  cd $$pkg && $(MAKE) install; cd ..;\
+	  CURDIR=`pwd`;\
+	  cd $$pkg && $(MAKE) install; cd $(CURDIR);\
 	done
 
 
@@ -35,7 +36,8 @@ install:
 uninstall:
 	$(MAKE) -f main.mk uninstall
 	@for pkg in $(PKGS); do\
-	  cd cmd && $(MAKE) uninstall; cd ..;\
+	  CURDIR=`pwd`;\
+	  cd cmd && $(MAKE) uninstall; cd $(CURDIR);\
 	done
 
 
@@ -45,31 +47,35 @@ clean:
 	$(MAKE) -f clean.mk clean
 	for pkg in $(PKGS); do $(MAKE) -C $$pkg clean; done
 	@for prj in $(PRJS); do\
-	  cd $$prj && $(MAKE) clean; cd ..;\
+	  CURDIR=`pwd`;\
+	  cd $$prj && $(MAKE) clean; cd $(CURDIR);\
 	done
- 
+
 
 # Deleting all files created by configuring or building the program
 # -----------------------------------------------------------------
 distclean: clean
 	$(MAKE) -f clean.mk distclean
 	@for pkg in $(PKGS); do\
-	  cd $$pkg && $(MAKE) -f clean.mk distclean; cd ..;\
+	  CURDIR=`pwd`;\
+	  cd $$pkg && $(MAKE) -f clean.mk distclean; cd $(CURDIR);\
 	done
 	@for prj in $(PRJS); do\
 	  cd $$prj && $(MAKE) distclean; cd ..;\
 	done
- 
+
 
 # Like clean but some files may still exist
 # -----------------------------------------
 mostlyclean: clean
 	$(MAKE) -f clean.mk mostlyclean
 	@for pkg in $(PKGS); do\
-	  cd $$pkg && $(MAKE) -f clean.mk mostlyclean; cd ..;\
+	  CURDIR=`pwd`;\
+	  cd $$pkg && $(MAKE) -f clean.mk mostlyclean; cd $(CURDIR);\
 	done
 	@for prj in $(PRJS); do\
-	  cd $$prj && $(MAKE) mostlyclean; cd ..;\
+	  CURDIR=`pwd`;\
+	  cd $$prj && $(MAKE) mostlyclean; cd $(CURDIR);\
 	done
 
 
@@ -79,10 +85,12 @@ mostlyclean: clean
 realclean: distclean
 	$(MAKE) -f clean.mk realclean
 	@for pkg in $(PKGS); do\
-	  cd $$pkg && $(MAKE) -f clean.mk realclean; cd ..;\
+	  CURDIR=`pwd`;\
+	  cd $$pkg && $(MAKE) -f clean.mk realclean; cd $(CURDIR);\
 	done
 	@for prj in $(PRJS); do\
-	  cd $$prj && $(MAKE) realclean; cd ..;\
+	  CURDIR=`pwd`;\
+	  cd $$prj && $(MAKE) realclean; cd $(CURDIR);\
 	done
 
 
@@ -111,7 +119,8 @@ installcheck:
 dep:
 	$(MAKE) -f main.mk dep
 	@for pkg in $(PKGS); do\
-	  cd $$pkg && $(MAKE) dep; cd ..;\
+	  CURDIR=`pwd`;\
+	  cd $$pkg && $(MAKE) dep; cd $(CURDIR);\
 	done
 
 
diff --git a/configure b/configure
index ab9eaed3..b3ef23a5 100755
--- a/configure
+++ b/configure
@@ -523,7 +523,7 @@ fi
 
 
 
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -2450,7 +2450,7 @@ EOF
 
 # Generating output files
 # ===========================================================================
-subdirs="s51.src"
+subdirs="sim/mcs51"
 
 trap '' 1 2 15
 cat > confcache <<\EOF
@@ -2867,7 +2867,7 @@ if test "$no_recursion" != yes; then
     esac
   done
 
-  for ac_config_dir in s51.src; do
+  for ac_config_dir in sim/mcs51; do
 
     # Do not complain, so a configure script can configure whichever
     # parts of a large source tree are present.
diff --git a/configure.in b/configure.in
index 4f235909..0469622c 100755
--- a/configure.in
+++ b/configure.in
@@ -192,7 +192,7 @@ AC_DEFINE_UNQUOTED(SRCDIR, "${config_in}")
 
 # Generating output files
 # ===========================================================================
-AC_CONFIG_SUBDIRS(sim/msc51)
+AC_CONFIG_SUBDIRS(sim/mcs51)
 AC_OUTPUT(main.mk:main_in.mk
 support/gc/Makefile
 src/Makefile