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

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

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

Log Message:
-----------
imported fixes from the s11n tree

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-01-23 14:57:46 UTC (rev 114)
+++ trunk/toc2/make/makerules.c-dlls	2008-04-24 22:09:32 UTC (rev 115)
@@ -39,7 +39,7 @@
   ${t}.DLL: \$(${t}.DLL)
 endif
 ${t}.DLL.DO_INSTALL ?= \$(c-dlls.DO_INSTALL)
-${t}.DLL.INSTALL_DEST ?= \$(package.install.dlls.dest)
+${t}.DLL.INSTALL_DEST ?= \$(DESTDIR)/\$(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-01-23 14:57:46 UTC (rev 114)
+++ trunk/toc2/make/toc2-install.make	2008-04-24 22:09:32 UTC (rev 115)
@@ -131,13 +131,13 @@
 	test $$wholename -ef $$target || { \
 		echo "Installing/symlinking $$target"; \
 		cmd="$(toc2.bins.installer) -s $$wholename $$target"; \
-		$$cmd || exit $$?; \
+		$$cmd || { x=$$?; echo "Install of $$wholename failed"; exit $$x; } \
 	}; \
 	cd $(5); \
 	for i in $(1) $(1).$(2) $(1).$(2).$(3); do \
 		test -e $$i && rm -f $$i; \
 		cmd="ln -fs $$wholename $$i"; echo $$cmd; \
-		$$cmd || exit $$?; \
+		$$cmd || { x=$$?; echo "Symlinking of $$wholename --> $$i failed"; exit $$x; } \
 	done
 ## symlinking method number 2:
 ##			{ set -x; \


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