[csw-devel] SF.net SVN: gar:[21712] csw/mgar/gar/v2/gar.conf.mk

[dmichelsen at users.sourceforge.net]

Revision: 21712
          http://gar.svn.sourceforge.net/gar/?rev=21712&view=rev
Author:   dmichelsen
Date:     2013-08-12 14:51:11 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
mGAR v2: Add other stuff if NORUNPATH is given

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2013-08-11 14:12:53 UTC (rev 21711)
+++ csw/mgar/gar/v2/gar.conf.mk	2013-08-12 14:51:11 UTC (rev 21712)
@@ -689,6 +689,7 @@
 ifndef NOISALIST
 RUNPATH_ISALIST ?= $(EXTRA_RUNPATH_DIRS) $(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install)
 endif
+endif
 
 LINKER_MAP_RELEASE-5.10 ?= solaris10
 LINKER_MAP_RELEASE ?= $(LINKER_MAP_RELEASE-$(GAROSREL))
@@ -700,7 +701,6 @@
 # Iterate over all directories in RUNPATH_DIRS, prefix each directory with one
 # with $ISALIST if it exists in RUNPATH_ISALIST, then append remaining dirs from RUNPATH_ISALIST
 RUNPATH_LINKER_FLAGS ?= $(foreach D,$(RUNPATH_DIRS),$(addprefix -R,$(addsuffix /\$$ISALIST,$(filter $D,$(RUNPATH_ISALIST))) $(abspath $D/$(MM_LIBDIR)))) $(addprefix -R,$(filter-out $(RUNPATH_DIRS),$(RUNPATH_ISALIST))) $(EXTRA_RUNPATH_LINKER_FLAGS)
-endif
 
 LINKER_FLAGS ?= $(PREPEND_LINKER_FLAGS) $(foreach ELIB,$(EXTRA_LIB) $(filter-out $(libpath_install),$(libdir_install)) $(libpath_install),-L$(abspath $(ELIB)/$(MM_LIBDIR))) $(EXTRA_LINKER_FLAGS)
 

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