Move library files and headers to an sdcc subdirectory.

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

diff --git a/configure b/configure
index 1b5777908704832c14f20a64b299d0eb88e3ff4b..139bf14cb582320eac449e28b358d4db130e5515 100755 (executable)
--- a/configure
+++ b/configure
@@ -2454,21 +2454,31 @@ if test "${prefix}" = "NONE"; then
 fi
 
 config_in=`pwd`
+sdcc_datadir=${datadir}/sdcc
+
+
+# For some unknown reason, putting this assignment in a subshell
+# like this causes the rvalue to be fully substituted. We need this
+# for the defines below to generate the right thing. We keep this
+# separate from the substituted sdcc_datadir because we want the
+# latter for makefiles.
 if test "${datadir}" = "\${prefix}/share"; then
-  sdcc_datadir=${prefix}/share
+    sdcc_datadir_tmp=${prefix}/share
 else
-  sdcc_datadir=${datadir}
+    sdcc_datadir_tmp=${datadir}
 fi
+
+
 cat >> confdefs.h <<EOF
-#define STANDARD_INCLUDE_DIR "${sdcc_datadir}/include"
+#define STANDARD_INCLUDE_DIR "${sdcc_datadir_tmp}/include"
 EOF
 
 cat >> confdefs.h <<EOF
-#define SDCC_INCLUDE_DIR "${sdcc_datadir}/include"
+#define SDCC_INCLUDE_DIR "${sdcc_datadir_tmp}/include"
 EOF
 
 cat >> confdefs.h <<EOF
-#define SDCC_LIB_DIR "${sdcc_datadir}/lib"
+#define SDCC_LIB_DIR "${sdcc_datadir_tmp}/lib"
 EOF
 
 cat >> confdefs.h <<EOF
@@ -2497,7 +2507,7 @@ cat >> confdefs.h <<EOF
 EOF
 
 cat >> confdefs.h <<EOF
-#define DATADIR "${sdcc_datadir}"
+#define DATADIR "${sdcc_datadir_tmp}"
 EOF
 
 cat >> confdefs.h <<EOF
@@ -2506,6 +2516,7 @@ EOF
 
 
 
+
 # Now handle the port selection
 # Check whether --enable-z80-port or --disable-z80-port was given.
 if test "${enable_z80_port+set}" = set; then
@@ -2748,6 +2759,7 @@ s%@AUTOCONF@%$AUTOCONF%g
 s%@AS@%$AS%g
 s%@CP@%$CP%g
 s%@M_OR_MM@%$M_OR_MM%g
+s%@sdcc_datadir@%$sdcc_datadir%g
 s%@subdirs@%$subdirs%g
 
 CEOF

diff --git a/configure.in b/configure.in
index 1443114dd0f16b6e6b40f71fbc37916de724dd7d..a10be911bf0d316bebb16c302bd03f61ca183378 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -182,14 +182,24 @@ if test "${prefix}" = "NONE"; then
 fi
 
 config_in=`pwd`
+sdcc_datadir=${datadir}/sdcc
+AC_SUBST(sdcc_datadir)
+
+# For some unknown reason, putting this assignment in a subshell
+# like this causes the rvalue to be fully substituted. We need this
+# for the defines below to generate the right thing. We keep this
+# separate from the substituted sdcc_datadir because we want the
+# latter for makefiles.
 if test "${datadir}" = "\${prefix}/share"; then
-  sdcc_datadir=${prefix}/share
+    sdcc_datadir_tmp=${prefix}/share
 else
-  sdcc_datadir=${datadir}
+    sdcc_datadir_tmp=${datadir}
 fi
-AC_DEFINE_UNQUOTED(STANDARD_INCLUDE_DIR, "${sdcc_datadir}/include")
-AC_DEFINE_UNQUOTED(SDCC_INCLUDE_DIR, "${sdcc_datadir}/include")
-AC_DEFINE_UNQUOTED(SDCC_LIB_DIR, "${sdcc_datadir}/lib")
+
+
+AC_DEFINE_UNQUOTED(STANDARD_INCLUDE_DIR, "${sdcc_datadir_tmp}/include")
+AC_DEFINE_UNQUOTED(SDCC_INCLUDE_DIR, "${sdcc_datadir_tmp}/include")
+AC_DEFINE_UNQUOTED(SDCC_LIB_DIR, "${sdcc_datadir_tmp}/lib")
 AC_DEFINE_UNQUOTED(STD_LIB, "libsdcc")
 AC_DEFINE_UNQUOTED(STD_INT_LIB, "libint")
 AC_DEFINE_UNQUOTED(STD_LONG_LIB, "liblong")
@@ -197,10 +207,11 @@ AC_DEFINE_UNQUOTED(STD_FP_LIB, "libfloat")
 AC_DEFINE_UNQUOTED(STD_DS390_LIB, "libds390")
 
 AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")
-AC_DEFINE_UNQUOTED(DATADIR, "${sdcc_datadir}")
+AC_DEFINE_UNQUOTED(DATADIR, "${sdcc_datadir_tmp}")
 AC_DEFINE_UNQUOTED(SRCDIR, "${config_in}")
 
 
+
 # Now handle the port selection
 AC_ARG_ENABLE(z80-port,--disable-z80-port: Excludes the z80 port)
 if test "$enable_z80_port" = "no"; then

diff --git a/device/include/Makefile.in b/device/include/Makefile.in
index 90098b7b7bbcc3e5abd4cb65d52d8bd43694dee5..b6e175efac3a5051c584067276a0c6ddf00beac3 100644 (file)
--- a/device/include/Makefile.in
+++ b/device/include/Makefile.in
@@ -19,6 +19,7 @@ exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
+sdcc_datadir    = @sdcc_datadir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
@@ -37,13 +38,13 @@ all:
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: all installdirs
-       $(CP) *.h $(datadir)/include/
+       $(CP) *.h $(sdcc_datadir)/include/
 
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-       for hdr in *.h; do rm -f $(datadir)/$$hdr; done
+       for hdr in *.h; do rm -f $(sdcc_datadir)/$$hdr; done
 
 
 # Performing self-test
@@ -59,7 +60,7 @@ installcheck:
 # Creating installation directories
 # ---------------------------------
 installdirs:
-       [ -d $(datadir)/include ] || mkdir -p $(datadir)/include
+       [ -d $(sdcc_datadir)/include ] || mkdir -p $(sdcc_datadir)/include
 
 
 # Creating dependencies

diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in
index 25746d17292c82bef5726da421e8ca284713f4ec..1d3ad65542bb0e90919bae388e3b1d6a9fb02cb3 100644 (file)
--- a/device/lib/Makefile.in
+++ b/device/lib/Makefile.in
@@ -23,6 +23,7 @@ exec_prefix     = @exec_prefix@
 bindir          = @bindir@
 libdir          = @libdir@
 datadir         = @datadir@
+sdcc_datadir    = @sdcc_datadir@
 includedir      = @includedir@
 mandir          = @mandir@
 man1dir         = $(mandir)/man1
@@ -83,26 +84,26 @@ modelDS390:
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install: installDS390
-       $(CP) *.c $(datadir)/lib/
+       $(CP) *.c $(sdcc_datadir)/lib/
        for model in $(MODELS); do \
         [ -d $$model ] || $(MAKE) all; \
-        $(CP) $$model/*.rel *.lib $(datadir)/lib/$$model/; \
-        $(CP) $$model/*.asm $(datadir)/lib/$$model/; \
-        $(CP) $$model/*.cdb $(datadir)/lib/$$model/; \
+        $(CP) $$model/*.rel *.lib $(sdcc_datadir)/lib/$$model/; \
+        $(CP) $$model/*.asm $(sdcc_datadir)/lib/$$model/; \
+        $(CP) $$model/*.cdb $(sdcc_datadir)/lib/$$model/; \
        done
 
 installDS390: installdirs
-       $(CP) ds390/*.lib ds390/*.rel ds390/*.asm ds390/*.cdb $(datadir)/lib/ds390
+       $(CP) ds390/*.lib ds390/*.rel ds390/*.asm ds390/*.cdb $(sdcc_datadir)/lib/ds390
 
 # Deleting all the installed files
 # --------------------------------
 uninstall:
-       for hdr in ../include/*.h; do rm -f $(datadir)/include/$$hdr; done
-       for cfl in *.c; do rm -f $(datadir)/lib/$$cfl; done
+       for hdr in ../include/*.h; do rm -f $(sdcc_datadir)/include/$$hdr; done
+       for cfl in *.c; do rm -f $(sdcc_datadir)/lib/$$cfl; done
        for model in $(MODELS); do \
-         rm -rf $(datadir)/lib/$$model; \
+         rm -rf $(sdcc_datadir)/lib/$$model; \
        done
-       rm -rf $(datadir)/lib/ds390
+       rm -rf $(sdcc_datadir)/lib/ds390
 
 
 # Performing self-test
@@ -118,12 +119,12 @@ installcheck:
 # Creating installation directories
 # ---------------------------------
 installdirs:
-       [ -d $(datadir)/lib ] || mkdir -p $(datadir)/lib
+       [ -d $(sdcc_datadir)/lib ] || mkdir -p $(sdcc_datadir)/lib
        for model in $(MODELS); do \
-        [ -d $(datadir)/lib/$$model ] || \
-        mkdir -p $(datadir)/lib/$$model; \
+        [ -d $(sdcc_datadir)/lib/$$model ] || \
+        mkdir -p $(sdcc_datadir)/lib/$$model; \
        done
-       [ -d $(datadir)/lib/ds390 ] || mkdir -p $(datadir)/lib/ds390
+       [ -d $(sdcc_datadir)/lib/ds390 ] || mkdir -p $(sdcc_datadir)/lib/ds390
 
 # Creating dependencies
 # ---------------------