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 87aaac95fe4cf39e20830f715597ef0c36a13188..c2b0e5033b147afc99363374f1eb482745107cf6 100644 (file)
--- 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 ab9eaed33b5495b438f1e95be7549a6b454b5279..b3ef23a5c45cd31ba4c6f1ed1147b28e29f44d6d 100755 (executable)
--- 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 4f235909ac623d25edd718936fe94a74d614bf58..0469622c43723fb14a98f1ab746c42481fb4e628 100755 (executable)
--- 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