changeset 5418:bc7fe24c4435

. Move the location where X11_PATH, PACKAGE_PATH and ALSA_HEADERS_PATH from common/Defs-bsd.gmk to common/shared/Defs-bsd.gmk to make the default values available to the sanity checks. Fixes build when these paths are not set and defaults are intended.
author kurt
date Fri, 11 Jan 2013 08:52:46 -0500
parents 9d0b9ae6e639
children 8aa77b30443e
files make/common/Defs-bsd.gmk make/common/shared/Defs-bsd.gmk
diffstat 2 files changed, 37 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/Defs-bsd.gmk	Wed Aug 22 11:00:40 2012 -0700
+++ b/make/common/Defs-bsd.gmk	Fri Jan 11 08:52:46 2013 -0500
@@ -441,43 +441,6 @@
 override USING_GNU_TAR           = true
 override WRITE_LIBVERSION        = false
 
-ifdef ALT_X11_PATH
-  X11_PATH = $(ALT_X11_PATH)
-else
-  ifeq ($(OS_VENDOR), NetBSD)
-    X11_PATH = /usr/X11R7
-  else
-    ifeq ($(OS_VENDOR), FreeBSD)
-      X11_PATH = /usr/local
-    else
-      X11_PATH = /usr/X11R6
-    endif
-  endif
-endif
-
-ifdef ALT_PACKAGE_PATH
-  PACKAGE_PATH = $(ALT_PACKAGE_PATH)
-else
-  ifeq ($(OS_VENDOR), NetBSD)
-    PACKAGE_PATH = /usr/pkg
-  else
-    PACKAGE_PATH = /usr/local
-  endif
-endif
-
-# ALSA
-ifdef ALT_ALSA_LIB_PATH
-  ALSA_LIB_PATH = $(ALT_ALSA_LIB_PATH)
-else
-  ALSA_LIB_PATH = $(PACKAGE_PATH)/lib
-endif
-
-ifdef ALT_ALSA_HEADERS_PATH
-  ALSA_HEADERS_PATH = $(ALT_ALSA_HEADERS_PATH)
-else
-  ALSA_HEADERS_PATH = $(PACKAGE_PATH)/include
-endif
-
 # USE_EXECNAME forces the launcher to look up argv[0] on $PATH, and put the
 # resulting resolved absolute name of the executable in the environment
 # variable EXECNAME.  That executable name is then used that to locate the
--- a/make/common/shared/Defs-bsd.gmk	Wed Aug 22 11:00:40 2012 -0700
+++ b/make/common/shared/Defs-bsd.gmk	Fri Jan 11 08:52:46 2013 -0500
@@ -53,6 +53,43 @@
 $(shell if [ "$1" != "" -a -d "$1" ]; then (cd $1 && pwd); else echo "$1"; fi)
 endef
 
+ifdef ALT_X11_PATH
+  X11_PATH = $(ALT_X11_PATH)
+else
+  ifeq ($(OS_VENDOR), NetBSD)
+    X11_PATH = /usr/X11R7
+  else
+    ifeq ($(OS_VENDOR), FreeBSD)
+      X11_PATH = /usr/local
+    else
+      X11_PATH = /usr/X11R6
+    endif
+  endif
+endif
+
+ifdef ALT_PACKAGE_PATH
+  PACKAGE_PATH = $(ALT_PACKAGE_PATH)
+else
+  ifeq ($(OS_VENDOR), NetBSD)
+    PACKAGE_PATH = /usr/pkg
+  else
+    PACKAGE_PATH = /usr/local
+  endif
+endif
+
+# ALSA
+ifdef ALT_ALSA_LIB_PATH
+  ALSA_LIB_PATH = $(ALT_ALSA_LIB_PATH)
+else
+  ALSA_LIB_PATH = $(PACKAGE_PATH)/lib
+endif
+
+ifdef ALT_ALSA_HEADERS_PATH
+  ALSA_HEADERS_PATH = $(ALT_ALSA_HEADERS_PATH)
+else
+  ALSA_HEADERS_PATH = $(PACKAGE_PATH)/include
+endif
+
 # Location on system where jdk installs might be
 USRJDKINSTANCES_PATH = $(PACKAGE_PATH)