[complement-svn] SF.net SVN: complement: [1797] trunk/complement/explore/Makefiles

[<com...@us...>]

Revision: 1797
          http://complement.svn.sourceforge.net/complement/?rev=1797&view=rev
Author:   complement
Date:     2007-12-11 15:02:38 -0800 (Tue, 11 Dec 2007)

Log Message:
-----------
install-headers usable; it use user-defined macro HEADERS_BASE
[catalog and all files, keeping directory structure] and HEADERS
[for single files]; target catalog is INSTALL_HDR_DIR, by default
it ${BASE_INSTALL_DIR}/include

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/ChangeLog
    trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak

Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog	2007-12-06 15:45:37 UTC (rev 1796)
+++ trunk/complement/explore/Makefiles/ChangeLog	2007-12-11 23:02:38 UTC (rev 1797)
@@ -1,3 +1,10 @@
+2007-12-12  Petr Ovtchenkov  <pt...@is...>
+
+	* gmake/unix/rules-install-so.mak: install-headers usable; it use
+	user-defined macro HEADERS_BASE [catalog and all files, keeping
+	directory structure] and HEADERS [for single files]; target catalog
+	is INSTALL_HDR_DIR, by default it ${BASE_INSTALL_DIR}/include.
+
 2007-11-13  Petr Ovtchenkov  <pt...@is...>
 
 	* gmake/unix/lib.mak: add macro LIBPREFIX to allow build shared

Modified: trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak	2007-12-06 15:45:37 UTC (rev 1796)
+++ trunk/complement/explore/Makefiles/gmake/unix/rules-install-so.mak	2007-12-11 23:02:38 UTC (rev 1797)
@@ -1,4 +1,4 @@
-# -*- makefile -*- Time-stamp: <07/02/07 14:58:53 ptr>
+# -*- makefile -*- Time-stamp: <07/12/12 01:51:37 ptr>
 #
 # Copyright (c) 1997-1999, 2002, 2003, 2005-2007
 # Petr Ovtchenkov
@@ -140,31 +140,33 @@
 	${POST_INSTALL_STLDBG}
 endif
 
+
 define do_install_headers
 if [ ! -d $(INSTALL_HDR_DIR) ]; then \
-  echo $(INSTALL_D) $(INSTALL_HDR_DIR); \
+  $(INSTALL_D) $(INSTALL_HDR_DIR) || { echo "Can't create $(INSTALL_HDR_DIR)"; exit 1; }; \
 fi; \
 for dd in $(HEADERS_BASE); do \
   d=`dirname $$dd`; \
   h=`basename $$dd`; \
-  f=`cd $$d; find $$h \( -type d \( -wholename "*/.svn" -o -prune \) \) -print`; \
+  f=`cd $$d; find $$h \( -wholename "*/.svn" -prune \) -o \( -type d -print \)`; \
   for ddd in $$f; do \
     if [ ! -d $(INSTALL_HDR_DIR)/$$ddd ]; then \
-      echo $(INSTALL_D) $(INSTALL_HDR_DIR)/$$ddd; \
+      $(INSTALL_D) $(INSTALL_HDR_DIR)/$$ddd || { echo "Can't create $(INSTALL_HDR_DIR)/$$ddd"; exit 1; }; \
     fi; \
   done; \
-  f=`find $$dd \( -type f \( \! \( -wholename "*/.svn/*" -o -name "*~" -o -name "*.bak" \) \) \) -print`; \
+  f=`find $$dd \( -wholename "*/.svn*" -o -name "*~" -o -name "*.bak" \) -prune -o \( -type f -print \)`; \
   for ff in $$f; do \
     h=`echo $$ff | sed -e "s|$$d|$(INSTALL_HDR_DIR)|"`; \
-    echo $(INSTALL_F) $$ff $$h; \
+    $(INSTALL_F) $$ff $$h; \
   done; \
 done; \
 for f in $(HEADERS); do \
   h=`basename $$f`; \
-  echo $(INSTALL_F) $$f $(INSTALL_HDR_DIR)/$$h; \
+  $(INSTALL_F) $$f $(INSTALL_HDR_DIR)/$$h || { echo "Can't install $(INSTALL_HDR_DIR)/$$h"; exit 1; }; \
 done
 endef
 
+# find $$dd \( -type f \( \! \( -wholename "*/.svn*" -o -name "*~" -o -name "*.bak" \) \) \) -print
 # _HEADERS_FROM = $(shell for dd in $(HEADERS_BASE); do find $$dd \( -type f \( \! \( -wholename "*/.svn/*" -o -name "*~" -o -name "*.bak" \) \) \) -print ; done )
 # _HEADERS_TO = $(foreach d,$(HEADERS_BASE),$(patsubst $(d)/%,$(BASE_INSTALL_DIR)include/%,$(_HEADERS_FROM)))
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.