diff options
-rw-r--r-- | pkgtools/xpkgwedge/Makefile | 10 | ||||
-rw-r--r-- | x11/xpkgwedge/Makefile | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 9b4fa7e4277..ac75c978422 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/08/09 23:16:18 tron Exp $ +# $NetBSD: Makefile,v 1.8 1998/08/11 19:29:26 tv Exp $ # DISTNAME= xpkgwedge-0.4 @@ -11,10 +11,6 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_IMAKE= yes -# In order to force xpkgwedge to install into X11BASE, we forcibly set PREFIX -# here. No other pkg should do this. -PREFIX=${X11BASE} - pre-extract: @if [ ! -f ${X11BASE}/include/X11/X.h ]; then \ ${ECHO} 'xpkgwedge requires $$X11BASE to point to the real X distribution.'; \ @@ -35,6 +31,10 @@ pre-clean: .include "../../mk/bsd.pkg.mk" +# In order to force xpkgwedge to install into X11BASE, we forcibly override +# any user setting of USE_LOCALBASE_FOR_X11. _NO_ other pkg should do this. +PREFIX=${X11BASE} + # Clear the build dependencies list so that xpkgwedge will not be recursively # dependent on itself. BUILD_DEPENDS= diff --git a/x11/xpkgwedge/Makefile b/x11/xpkgwedge/Makefile index 9b4fa7e4277..ac75c978422 100644 --- a/x11/xpkgwedge/Makefile +++ b/x11/xpkgwedge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 1998/08/09 23:16:18 tron Exp $ +# $NetBSD: Makefile,v 1.8 1998/08/11 19:29:26 tv Exp $ # DISTNAME= xpkgwedge-0.4 @@ -11,10 +11,6 @@ NO_BUILD= yes NO_WRKSUBDIR= yes USE_IMAKE= yes -# In order to force xpkgwedge to install into X11BASE, we forcibly set PREFIX -# here. No other pkg should do this. -PREFIX=${X11BASE} - pre-extract: @if [ ! -f ${X11BASE}/include/X11/X.h ]; then \ ${ECHO} 'xpkgwedge requires $$X11BASE to point to the real X distribution.'; \ @@ -35,6 +31,10 @@ pre-clean: .include "../../mk/bsd.pkg.mk" +# In order to force xpkgwedge to install into X11BASE, we forcibly override +# any user setting of USE_LOCALBASE_FOR_X11. _NO_ other pkg should do this. +PREFIX=${X11BASE} + # Clear the build dependencies list so that xpkgwedge will not be recursively # dependent on itself. BUILD_DEPENDS= |