changeset 26:251ac9a519c2

. Allow the base location for X11 to be overridden, but continue to default to /usr/X11R6.
author glewis@misty.eyesbeyond.com
date Wed, 08 Oct 2008 21:47:41 -0700
parents 8a7e68362fa8
children e94711bdffb1
files make/common/Defs-bsd.gmk make/common/Defs-linux.gmk make/common/Defs.gmk
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Defs-bsd.gmk	Wed Aug 20 10:30:26 2008 -0700
+++ b/make/common/Defs-bsd.gmk	Wed Oct 08 21:47:41 2008 -0700
@@ -260,7 +260,7 @@
 override LIBTHREAD               =
 override MOOT_PRIORITIES         = true
 override NO_INTERRUPTIBLE_IO     = false
-override OPENWIN_HOME            = /usr/X11R6
+override OPENWIN_HOME            = $(X11_PATH)
 override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
 override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
 override SUN_CMM_SUBDIR          =
--- a/make/common/Defs-linux.gmk	Wed Aug 20 10:30:26 2008 -0700
+++ b/make/common/Defs-linux.gmk	Wed Oct 08 21:47:41 2008 -0700
@@ -282,7 +282,7 @@
 override LIBTHREAD               =
 override MOOT_PRIORITIES         = true
 override NO_INTERRUPTIBLE_IO     = true
-override OPENWIN_HOME            = /usr/X11R6
+override OPENWIN_HOME            = $(X11_PATH)
 ifeq ($(ARCH), amd64)
 override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
 else
--- a/make/common/Defs.gmk	Wed Aug 20 10:30:26 2008 -0700
+++ b/make/common/Defs.gmk	Wed Oct 08 21:47:41 2008 -0700
@@ -104,6 +104,14 @@
 
 LDLIBS_COMMON += $(EXTRA_LIBS)
 
+ifneq ($(PLATFORM), windows)
+  ifdef ALT_X11_PATH
+    X11_PATH = $(ALT_X11_PATH)
+  else
+    X11_PATH = /usr/X11R6
+  endif 
+endif
+
 #
 # Default is to build, not import native binaries
 #