* configure,

* configure.in: replaced duplicate message about ucsim by missing sdcpp
* install-sh: fix bug #1204398 by setting umask 0022
* device/lib/Makefile.in: separate build of z80 and gbz80 lib

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

diff --git a/ChangeLog b/ChangeLog
index b05ad604db5ba15f11247ab7713b13d7a960d9bc..9d866f07cf6e6da62a131c91fa8be42eaeff360d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,14 @@
        * device/lib/ds390/Makefile.in,
        * device/lib/ds400/Makefile.in: added srcdir to include search path,
        thanks to Borut for the bug report
+       * configure.in,
+       * configure: always create doc/Makefile independent from --enable-doc
+       * Makefile.in: always install from directory doc independent from
+       --enable-doc
+       * device/lib/pic/Makefile.in: added libdev again, it was erroneously
+       removed
+       * device/lib/pic/libdev/Makefile.in: fixed VPATH build
+       * doc/Makefile.in: install *.txt if present
 
 2006-04-28 Raphael Neider <rneider AT web.de>
 

diff --git a/Makefile.in b/Makefile.in
index 8942a698de5b7ffa8bf81689b3b20adea64216d0..380db7517c93e418ba40c1b94d71e26bdd3a260b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,8 +51,9 @@ endif
 
 ifeq ($(OPT_ENABLE_DOC), 1)
 TARGETS         += sdcc-doc
-PKGS            += $(SDCC_DOC)
 endif
+# always install docs, which don't need to be built 
+PKGS            += $(SDCC_DOC)
 
 ifeq ($(OPT_DISABLE_SDCPP), 0)
 SDCC_LIBS       += support/cpp2

diff --git a/configure b/configure
index 997f3ba618f7a580b0bacd7baac9e344e55809fa..dbc1dcc8e47e29b3b2bb14165e0c4a0fd099af42 100755 (executable)
--- a/configure
+++ b/configure
@@ -7946,7 +7946,7 @@ test $OPT_DISABLE_UCSIM   = 0 &&
 
 subdirs="$subdirs sim/ucsim"
 
-test $OPT_ENABLE_DOC      = 1 &&           ac_config_files="$ac_config_files doc/Makefile"
+          ac_config_files="$ac_config_files doc/Makefile"
 
 
 test $OPT_DISABLE_AVR = 0 &&           ac_config_files="$ac_config_files src/avr/Makefile"

diff --git a/configure.in b/configure.in
index 21fb14e8f022f204a1d3dd0102010560d010f53f..53753adf1005cc81d7f8c33fcf2b7f6e68a35e10 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -628,7 +628,7 @@ mv ports ports.build
 test $OPT_DISABLE_SDCPP   = 0 && AC_CONFIG_SUBDIRS(support/cpp2)
 test $OPT_DISABLE_PACKIHX = 0 && AC_CONFIG_SUBDIRS(packihx)
 test $OPT_DISABLE_UCSIM   = 0 && AC_CONFIG_SUBDIRS(sim/ucsim)
-test $OPT_ENABLE_DOC      = 1 && AC_CONFIG_FILES([doc/Makefile])
+AC_CONFIG_FILES([doc/Makefile])
 
 test $OPT_DISABLE_AVR = 0 && AC_CONFIG_FILES([src/avr/Makefile])
 

diff --git a/device/lib/pic/Makefile.in b/device/lib/pic/Makefile.in
index 6eebdffb0d0ae662819d31313fb26b29acce70f1..29ad0cc9a03d70d6a1764aa1e2b3f622a3a49ee7 100644 (file)
--- a/device/lib/pic/Makefile.in
+++ b/device/lib/pic/Makefile.in
@@ -29,7 +29,7 @@ all % :
 
 else
 
-SUBDIRS           = libsdcc
+SUBDIRS           = libsdcc libdev
 builddir   = build
 installdir = bin
 export installdir

diff --git a/device/lib/pic/libdev/Makefile.in b/device/lib/pic/libdev/Makefile.in
index f15d02eeb7d309d550a9ded87ddc3318cd2807d6..451b2398d3457961a1eb7c59036d443b49cae8b0 100644 (file)
--- a/device/lib/pic/libdev/Makefile.in
+++ b/device/lib/pic/libdev/Makefile.in
@@ -1,6 +1,9 @@
 SDCC_BASE = ../../../..
 INSTALL_DIR = ../bin
 
+VPATH  = @srcdir@
+srcdir = @srcdir@
+
 CC = $(SDCC_BASE)/bin/sdcc
 LIB = @GPLIB@
 CP = @CP@
@@ -9,7 +12,7 @@ RMDIR = @RMDIR@
 
 CPPFLAGS = -I$(srcdir)/../../../include/pic
 
-C_SRC = $(wildcard pic16*.c)
+C_SRC = $(notdir $(wildcard $(srcdir)/pic16*.c))
 OBJS = $(C_SRC:.c=.o)
 LIBS = $(addprefix $(INSTALL_DIR)/,$(OBJS:.o=.lib))
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1b15441ed4ba5f004a54e03b84d6920d630b9da3..b483ac11a597b4466e85bd8c8b7871c559948930 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -22,7 +22,8 @@ all: $(MANUAL).pdf $(MANUAL).html/index.html $(MANUAL).txt \
 install:
        $(INSTALL) -d $(DESTDIR)$(docdir)
        cp -rf $(srcdir)/*.txt $(srcdir)/z80 $(srcdir)/avr $(DESTDIR)$(docdir)
-       cp -rf *.txt $(DESTDIR)$(docdir)
+       txtfiles=`echo *.txt | grep -v '\*\.txt' || true`
+       if [    $(txtfiles)               ]; then cp     $(txtfiles)    $(DESTDIR)$(docdir); fi
        if [ -f $(MANUAL).html/index.html ]; then cp -rf $(MANUAL).html $(DESTDIR)$(docdir); fi
        if [ -f $(TSS).html/index.html    ]; then cp -rf $(TSS).html    $(DESTDIR)$(docdir); fi
        if [ -f $(CDB).html/index.html    ]; then cp -rf $(CDB).html    $(DESTDIR)$(docdir); fi