[csw-devel] SF.net SVN: gar:[4596] csw/mgar/gar/v2

[dmichelsen at users.sourceforge.net]

Revision: 4596
          http://gar.svn.sourceforge.net/gar/?rev=4596&view=rev
Author:   dmichelsen
Date:     2009-04-29 15:40:22 +0000 (Wed, 29 Apr 2009)

Log Message:
-----------
mGAR v2: Allow resetting prefix in categories to completely relocate trees, here: x11

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

Modified: csw/mgar/gar/v2/categories/x11/category.mk
===================================================================
--- csw/mgar/gar/v2/categories/x11/category.mk	2009-04-29 15:32:23 UTC (rev 4595)
+++ csw/mgar/gar/v2/categories/x11/category.mk	2009-04-29 15:40:22 UTC (rev 4596)
@@ -14,24 +14,27 @@
 # Preprocessor flags
 
 # Linker flags
-LDFLAGS      += -L/opt/csw/lib -R/opt/csw/lib
+#LDFLAGS      += -L/opt/csw/lib -R/opt/csw/lib
 
 # Defines some tools used by autostuff
 GREP = ggrep
+_CATEGORY_COMMON_EXPORTS = GREP
 
 # export the variables
-export LDFLAGS CXXFLAGS CFLAGS CPPFLAGS GREP
+#export LDFLAGS CXXFLAGS CFLAGS CPPFLAGS GREP
 
 # pkg-config options
-_CATEGORY_PKG_CONFIG_PATH = $(abspath $(prefix)/X11/lib/$(MM_LIBDIR)/pkgconfig)
+#_CATEGORY_PKG_CONFIG_PATH = $(abspath $(prefix)/X11/lib/$(MM_LIBDIR)/pkgconfig)
 
+prefix = $(BUILD_PREFIX)/X11
+
 # Configure common options
-CONFIGURE_ARGS  = --prefix=/opt/csw/X11 
-CONFIGURE_ARGS += --exec-prefix=/opt/csw/X11 
-CONFIGURE_ARGS += --libdir=/opt/csw/X11/lib
-CONFIGURE_ARGS += --includedir=/opt/csw/X11/include
-CONFIGURE_ARGS += --datadir=/opt/csw/X11/share
-CONFIGURE_ARGS += --mandir=/opt/csw/X11/share/man
+#CONFIGURE_ARGS  = --prefix=/opt/csw/X11 
+#CONFIGURE_ARGS += --exec-prefix=/opt/csw/X11 
+#CONFIGURE_ARGS += --libdir=/opt/csw/X11/lib
+#CONFIGURE_ARGS += --includedir=/opt/csw/X11/include
+#CONFIGURE_ARGS += --datadir=/opt/csw/X11/share
+#CONFIGURE_ARGS += --mandir=/opt/csw/X11/share/man
 
 # No tests scripts, thus there is no "gmake test" target
 TEST_SCRIPTS      = 

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2009-04-29 15:32:23 UTC (rev 4595)
+++ csw/mgar/gar/v2/gar.conf.mk	2009-04-29 15:40:22 UTC (rev 4596)
@@ -121,6 +121,8 @@
 binpath            ?= $(abspath $(binpath_install)/$(MM_BINDIR))
 sbinpath_install   ?= $(BUILD_PREFIX)/sbin
 sbinpath           ?= $(abspath $(sbinpath_install)/$(MM_BINDIR))
+libpath_install    ?= $(BUILD_PREFIX)/lib
+libpath            ?= $(abspath $(libpath_install)/$(MM_LIBDIR))
 
 # DESTDIR is used at INSTALL TIME ONLY to determine what the
 # filesystem root should be.
@@ -448,10 +450,10 @@
 # may not be a subdirectory for the 32-bit standard case (this would normally
 # be a symlink of the form lib/sparcv8 -> . and lib/i386 -> .). This is most likely
 # the case for libraries in $(EXTRA_LIBS) for which no links generated in CSWcommon.
-RUNPATH_DIRS ?= $(libdir_install) $(EXTRA_LIB) $(EXTRA_RUNPATH_DIRS)
+RUNPATH_DIRS ?= $(libpath_install) $(libdir_install) $(EXTRA_LIB) $(EXTRA_RUNPATH_DIRS)
 
 ifndef NOISALIST
-RUNPATH_ISALIST ?= $(libdir_install) $(EXTRA_LIB) $(EXTRA_RUNPATH_ISALIST)
+RUNPATH_ISALIST ?= $(libpath_install) $(libdir_install) $(EXTRA_LIB) $(EXTRA_RUNPATH_ISALIST)
 endif
 
 # Iterate over all directories in RUNPATH_DIRS, prefix each directory with one
@@ -493,7 +495,7 @@
 PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(binpath_install)/$(MM_BINDIR)):$(DESTDIR)$(binpath_install):$(abspath $(DESTDIR)$(sbinpath_install)/$(MM_BINDIR)):$(DESTDIR)$(sbinpath_install):)$(abspath $(binpath_install)/$(MM_BINDIR)):$(binpath_install):$(abspath $(sbinpath_install)/$(MM_BINDIR)):$(sbinpath_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin:/usr/openwin/bin
 
 # This is for foo-config chaos
-PKG_CONFIG_DIRS ?= $(libdir_install) $(EXTRA_PKG_CONFIG_DIRS)
+PKG_CONFIG_DIRS ?= $(libpath_install) $(libdir_install) $(EXTRA_PKG_CONFIG_DIRS)
 PKG_CONFIG_PATH ?= $(call MAKEPATH,$(foreach D,$(PKG_CONFIG_DIRS),$(abspath $D/$(MM_LIBDIR)/pkgconfig)) $(_CATEGORY_PKG_CONFIG_PATH) $(EXTRA_PKG_CONFIG_PATH))
 
 #
@@ -557,7 +559,7 @@
 GARPKG_EXPORTS += GARCH GAROSREL GARPACKAGE
 endif
 
-COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS)
+COMMON_EXPORTS ?= $(DIRECTORY_EXPORTS) $(COMPILER_EXPORTS) $(GARPKG_EXPORTS) $(EXTRA_COMMON_EXPORTS) $(_CATEGORY_COMMON_EXPORTS)
 
 # LD_OPTIONS = $(LINKER_FLAGS)
 ifneq ($(LD_OPTIONS),)


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