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

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

Revision: 1816
          http://complement.svn.sourceforge.net/complement/?rev=1816&view=rev
Author:   complement
Date:     2008-02-26 05:06:33 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
take into account ${DESTDIR}

Modified Paths:
--------------
    trunk/complement/explore/Makefiles/ChangeLog
    trunk/complement/explore/Makefiles/gmake/targetdirs.mak
    trunk/complement/explore/configure

Modified: trunk/complement/explore/Makefiles/ChangeLog
===================================================================
--- trunk/complement/explore/Makefiles/ChangeLog	2008-02-26 10:55:11 UTC (rev 1815)
+++ trunk/complement/explore/Makefiles/ChangeLog	2008-02-26 13:06:33 UTC (rev 1816)
@@ -2,8 +2,10 @@
 
 	* gmake/gcc.mak: use more convenient option -dumpversion
 	to detect compiler's revision; check that -fuse-cxa-atexit
-	really required; remove -fident option.
+	really required; remove -fident option;
 
+	* gmake/targetdirs.mak: take into account DESTDIR.
+
 2008-01-17  Petr Ovtchenkov  <pt...@is...>
 
 	* gmake/topdoc.mak: rules to generate mps from mp, that was made

Modified: trunk/complement/explore/Makefiles/gmake/targetdirs.mak
===================================================================
--- trunk/complement/explore/Makefiles/gmake/targetdirs.mak	2008-02-26 10:55:11 UTC (rev 1815)
+++ trunk/complement/explore/Makefiles/gmake/targetdirs.mak	2008-02-26 13:06:33 UTC (rev 1816)
@@ -1,6 +1,6 @@
-# Time-stamp: <06/11/03 18:47:05 ptr>
+# Time-stamp: <08/02/26 15:42:24 yeti>
 #
-# Copyright (c) 1997-1999, 2002, 2003, 2005-2007
+# Copyright (c) 1997-1999, 2002, 2003, 2005-2008
 # Petr Ovtchenkov
 #
 # Portion Copyright (c) 1999-2001
@@ -37,7 +37,7 @@
 endif
 
 # BASE_INSTALL_DIR       ?= ${SRCROOT}/build/$(TARGET_NAME)
-BASE_INSTALL_DIR       ?= /usr/local
+BASE_INSTALL_DIR       ?= $(DESTDIR)/usr/local
 
 BASE_INSTALL_LIB_DIR   ?= ${BASE_INSTALL_DIR}
 BASE_INSTALL_BIN_DIR   ?= ${BASE_INSTALL_DIR}

Modified: trunk/complement/explore/configure
===================================================================
--- trunk/complement/explore/configure	2008-02-26 10:55:11 UTC (rev 1815)
+++ trunk/complement/explore/configure	2008-02-26 13:06:33 UTC (rev 1816)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Time-stamp: <08/01/17 01:11:57 ptr>
+# Time-stamp: <08/02/26 16:02:32 yeti>
 
 base=`cd \`dirname $0\`; echo $PWD`
 
@@ -12,7 +12,7 @@
 
 write_option() {
   target=`echo $1 | sed -e 's/^[^=]*=//'`
-  echo $2 := $target >> ${configmak}
+  echo $2 := $3$target >> ${configmak}
 }
 
 write_over_option() {
@@ -84,12 +84,12 @@
     # write_option "${PWD}/external/STLport" STLPORT_DIR
     write_option "1" WITHOUT_STLPORT
   fi
-  # write_option "${PWD}/build/" BASE_INSTALL_DIR
+  # write_option "${PWD}/build/" BASE_INSTALL_DIR '${DESTDIR}'
   if [ "$compiler_family_set" = "" ]; then
     write_option gcc COMPILER_NAME
   fi
   # if [ "$prefix_set" = "" ]; then
-  #   write_option "/usr/local" BASE_INSTALL_DIR
+  #   write_option "/usr/local" BASE_INSTALL_DIR '${DESTDIR}'
   # fi
 }
 
@@ -192,17 +192,17 @@
       compiler_family_set=y
       ;;
     --prefix=*)
-      write_option "$option" BASE_INSTALL_DIR
+      write_option "$option" BASE_INSTALL_DIR '${DESTDIR}'
       # prefix_set=y
       ;;
     --bindir=*)
-      write_option "$option" INSTALL_BIN_DIR
+      write_option "$option" INSTALL_BIN_DIR '${DESTDIR}'
       ;;
     --libdir=*)
-      write_option "$option" INSTALL_LIB_DIR
+      write_option "$option" INSTALL_LIB_DIR '${DESTDIR}'
       ;;
     --includedir=*)
-      write_option "$option" INSTALL_HDR_DIR
+      write_option "$option" INSTALL_HDR_DIR '${DESTDIR}'
       ;;
   esac
 done


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