[toc-cvstree] SF.net SVN: toc: [116] trunk/toc2/make

[<sg...@us...>]

Revision: 116
          http://toc.svn.sourceforge.net/toc/?rev=116&view=rev
Author:   sgbeal
Date:     2008-04-24 15:22:09 -0700 (Thu, 24 Apr 2008)

Log Message:
-----------
fixed the previous broken fix for DESTDIR and DLLs

Modified Paths:
--------------
    trunk/toc2/make/makerules.c-dlls
    trunk/toc2/make/toc2-install.make

Modified: trunk/toc2/make/makerules.c-dlls
===================================================================
--- trunk/toc2/make/makerules.c-dlls	2008-04-24 22:09:32 UTC (rev 115)
+++ trunk/toc2/make/makerules.c-dlls	2008-04-24 22:22:09 UTC (rev 116)
@@ -39,7 +39,7 @@
   ${t}.DLL: \$(${t}.DLL)
 endif
 ${t}.DLL.DO_INSTALL ?= \$(c-dlls.DO_INSTALL)
-${t}.DLL.INSTALL_DEST ?= \$(DESTDIR)/\$(package.install.dlls.dest)
+${t}.DLL.INSTALL_DEST ?= \$(package.install.dlls.dest)
 
 ifeq (1,\$(${t}.DLL.DO_INSTALL))
 # ^^^ disable install if ${t}.DLL.DO_INSTALL is set to non-1 value

Modified: trunk/toc2/make/toc2-install.make
===================================================================
--- trunk/toc2/make/toc2-install.make	2008-04-24 22:09:32 UTC (rev 115)
+++ trunk/toc2/make/toc2-install.make	2008-04-24 22:22:09 UTC (rev 116)
@@ -110,10 +110,10 @@
 # easily/reliably make a relative path from the target directory back to 
 # the install source:
 toc2.call.install-symlink = $(call toc2.call.install.grep_kludge,$(1)); \
-		test -d $(2) || mkdir -p "$(2)" || \
-			{ err=$$?; echo "$(@): mkdir -p $(2) failed"; exit $$err; }; \
+		root=$(DESTDIR)$(2); test -d $$root || mkdir -p "$$root" || \
+			{ err=$$?; echo "$(@): mkdir -p $$root failed"; exit $$err; }; \
 		for b in $(1) ""; do test -z "$$b" && continue; \
-			target=$(2)/$$b; \
+			target=$$root/$$b; \
 			test $$target -ef $$b && continue; \
 			echo "Symlinking $$target"; ln -s -f $$PWD/$$b $$target || exit $$?; \
 		done
@@ -125,15 +125,16 @@
 # $2-4 = Major, Minor, Patch version numbers
 # $5 = destination directory
 toc2.call.install-dll =  $(call toc2.call.install.grep_kludge,$(1)); \
-	test -d $(5) || mkdir -p $(5) || exit; \
+	root=$(DESTDIR)$(5); \
+	test -d $$root || mkdir -p $$root || exit; \
         wholename=$(1).$(2).$(3).$(4); \
-        target=$(5)/$$wholename; \
+        target=$$root/$$wholename; \
 	test $$wholename -ef $$target || { \
 		echo "Installing/symlinking $$target"; \
 		cmd="$(toc2.bins.installer) -s $$wholename $$target"; \
 		$$cmd || { x=$$?; echo "Install of $$wholename failed"; exit $$x; } \
 	}; \
-	cd $(5); \
+	cd $$root; \
 	for i in $(1) $(1).$(2) $(1).$(2).$(3); do \
 		test -e $$i && rm -f $$i; \
 		cmd="ln -fs $$wholename $$i"; echo $$cmd; \


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