Pass X11BASE to all sub-makes. I need it for a port, and I daresay that

there are a lot of hardwired "/usr/X11R6" paths out there that could stand
to use it as well.

1 files changed, 18 insertions, 18 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index d05188d352d5..2ce52f269d35 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3,7 +3,7 @@
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
 #
-# $Id: bsd.port.mk,v 1.149 1995/04/24 09:05:34 asami Exp $
+# $Id: bsd.port.mk,v 1.150 1995/04/24 10:41:51 asami Exp $
 #
 # Please view me with 4 column tabs!
 
@@ -517,7 +517,7 @@ do-configure:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 		sh ${SCRIPTDIR}/configure; \
 	fi
 .if defined(HAS_CONFIGURE)
@@ -540,9 +540,9 @@ do-configure:
 .if !target(do-build)
 do-build:
 .if defined(USE_GMAKE)
-	@(cd ${WRKSRC}; ${GMAKE} PREFIX=${PREFIX} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+	@(cd ${WRKSRC}; ${GMAKE} PREFIX=${PREFIX} X11BASE=${X11BASE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 .else defined(USE_GMAKE)
-	@(cd ${WRKSRC}; ${MAKE} PREFIX=${PREFIX} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
+	@(cd ${WRKSRC}; ${MAKE} PREFIX=${PREFIX} X11BASE=${X11BASE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 .endif
 .endif
 
@@ -551,12 +551,12 @@ do-build:
 .if !target(do-install)
 do-install:
 .if defined(USE_GMAKE)
-	@(cd ${WRKSRC}; ${GMAKE} PREFIX=${PREFIX} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+	@(cd ${WRKSRC}; ${GMAKE} PREFIX=${PREFIX} X11BASE=${X11BASE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 .if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
 	@(cd ${WRKSRC}; ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 .endif
 .else defined(USE_GMAKE)
-	@(cd ${WRKSRC}; ${MAKE} PREFIX=${PREFIX} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+	@(cd ${WRKSRC}; ${MAKE} PREFIX=${PREFIX} X11BASE=${X11BASE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 .if defined(USE_IMAKE) && !defined(NO_INSTALL_MANPAGES)
 	@(cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install.man)
 .endif
@@ -583,7 +583,7 @@ fetch: depends
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/pre-fetch; \
 	fi
 	@${MAKE} ${.MAKEFLAGS} do-fetch
@@ -594,7 +594,7 @@ fetch: depends
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/post-fetch; \
 	fi
 .endif
@@ -613,7 +613,7 @@ ${EXTRACT_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/pre-extract; \
 	fi
 	@${MAKE} ${.MAKEFLAGS} do-extract
@@ -624,7 +624,7 @@ ${EXTRACT_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/post-extract; \
 	fi
 	@${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}
@@ -644,7 +644,7 @@ ${PATCH_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/pre-patch; \
 	fi
 	@${MAKE} ${.MAKEFLAGS} do-patch
@@ -655,7 +655,7 @@ ${PATCH_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/post-patch; \
 	fi
 	@${TOUCH} ${TOUCH_FLAGS} ${PATCH_COOKIE}
@@ -675,7 +675,7 @@ ${CONFIGURE_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/pre-configure; \
 	fi
 	@${MAKE} ${.MAKEFLAGS} do-configure
@@ -686,7 +686,7 @@ ${CONFIGURE_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/post-configure; \
 	fi
 	@${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE}
@@ -706,7 +706,7 @@ ${BUILD_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/pre-build; \
 	fi
 	@${MAKE} ${.MAKEFLAGS} do-build
@@ -717,7 +717,7 @@ ${BUILD_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/post-build; \
 	fi
 	@${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE}
@@ -737,7 +737,7 @@ ${INSTALL_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/pre-install; \
 	fi
 	@${MAKE} ${.MAKEFLAGS} do-install
@@ -748,7 +748,7 @@ ${INSTALL_COOKIE}:
 		env CURDIR=${.CURDIR} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
 		  WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 		  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-		  DEPENDS="${DEPENDS}" \
+		  DEPENDS="${DEPENDS}" X11BASE=${X11BASE} \
 			sh ${SCRIPTDIR}/post-install; \
 	fi
 .if !defined(NO_PACKAGE)