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

[dmichelsen at users.sourceforge.net]

Revision: 3059
          http://gar.svn.sourceforge.net/gar/?rev=3059&view=rev
Author:   dmichelsen
Date:     2009-02-10 21:17:01 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
mGAR v2: Allow resetting of prefix without breaking the make process

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

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2009-02-10 21:16:04 UTC (rev 3058)
+++ csw/mgar/gar/v2/gar.conf.mk	2009-02-10 21:17:01 UTC (rev 3059)
@@ -106,6 +106,14 @@
 perlcswlib         ?= $(perllib)/csw
 perlpackroot       ?= $(perlcswlib)/auto
 
+# These variables are used to construct pathes. If you temporarily reset the above
+# variables for special install locations (like /opt/csw/bin/bdb44/) the definitions
+# here make sure the binaries for the make process are still found.
+binpath_install    ?= $(BUILD_PREFIX)/bin
+binpath            ?= $(abspath $(binpath_install)/$(MM_BINDIR))
+sbinpath_install   ?= $(BUILD_PREFIX)/sbin
+sbinpath           ?= $(abspath $(sbinpath_install)/$(MM_BINDIR))
+
 # DESTDIR is used at INSTALL TIME ONLY to determine what the
 # filesystem root should be.
 DESTROOT ?= $(HOME)
@@ -473,7 +481,7 @@
 # 1. Make sure everything works fine for SOS12
 # 2. Allow us to use programs we just built. This is a bit complicated,
 #    but we want PATH to be a recursive variable, or 'gmake isaenv' won't work
-PATH = $(if $(filter SOS12,$(GARCOMPILER)),$(abspath $(GARBIN)/sos12-wrappers):)$(if $(IGNORE_DESTDIR),,$(abspath $(DESTDIR)$(bindir_install)/$(MM_BINDIR)):$(DESTDIR)$(bindir_install):$(abspath $(DESTDIR)$(sbindir_install)/$(MM_BINDIR)):$(DESTDIR)$(sbindir_install):)$(abspath $(bindir_install)/$(MM_BINDIR)):$(bindir_install):$(abspath $(sbindir_install)/$(MM_BINDIR)):$(sbindir_install):$(CC_HOME)/bin:$(abspath $(GARBIN)):/usr/bin:/usr/sbin:/usr/java/bin:/usr/ccs/bin
+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
 
 # This is for foo-config chaos
 PKG_CONFIG_DIRS ?= $(libdir_install) $(EXTRA_PKG_CONFIG_DIRS)


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