[complement-svn] SF.net SVN: complement: [1391] trunk/complement/explore/Makefiles/gmake/ linux
Status: Pre-Alpha
Brought to you by:
complement
From: <com...@us...> - 2006-11-03 14:01:55
|
Revision: 1391 http://svn.sourceforge.net/complement/?rev=1391&view=rev Author: complement Date: 2006-11-03 06:01:48 -0800 (Fri, 03 Nov 2006) Log Message: ----------- fix typo; add semicolon; change point of disabling echo Modified Paths: -------------- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak =================================================================== --- trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2006-11-03 13:38:09 UTC (rev 1390) +++ trunk/complement/explore/Makefiles/gmake/linux/rules-install-so.mak 2006-11-03 14:01:48 UTC (rev 1391) @@ -23,9 +23,9 @@ define do_install_so_links $${INSTALL_LIB_DIR$(1)}/$${SO_NAME$(1)xxx}: ${SO_NAME_OUT$(1)xxx} $$(INSTALL_SO) $${SO_NAME_OUT$(1)xxx} $(INSTALL_LIB_DIR$(1)) - $(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx}) - $(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx}) - $(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x}) + @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx}) + @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx}) + @$(call do_so_links_1,$$(INSTALL_LIB_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x}) endef define do_install_so_links_wk Modified: trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak =================================================================== --- trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2006-11-03 13:38:09 UTC (rev 1390) +++ trunk/complement/explore/Makefiles/gmake/linux/rules-so.mak 2006-11-03 14:01:48 UTC (rev 1391) @@ -22,14 +22,14 @@ endif define do_so_links_1 -@if [ -h $(1)/$(2)} ] ; then \ +if [ -h $(1)/$(2) ]; then \ if [ `readlink $(1)/$(2)` != "$(3)" ]; then \ rm $(1)/$(2); \ ln -s $(3) $(1)/$(2); \ - fi \ + fi; \ else \ ln -s $(3) $(1)/$(2); \ -fi +fi; endef # Workaround for GNU make 3.80: it fail on 'eval' within 'if' @@ -53,9 +53,9 @@ else $$(LINK.c) $$(LINK_OUTPUT_OPTION) $$(OBJ$(1)) $$(LDLIBS) endif - $(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx}) - $(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx}) - $(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x}) + @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)xx},$${SO_NAME$(1)xxx}) + @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)x},$${SO_NAME$(1)xx}) + @$(call do_so_links_1,$$(OUTPUT_DIR$(1)),$${SO_NAME$(1)},$${SO_NAME$(1)x}) endef define do_so_links_wk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |