diff options
| author | abs <abs> | 2002-08-23 14:27:14 +0000 |
|---|---|---|
| committer | abs <abs> | 2002-08-23 14:27:14 +0000 |
| commit | cd15812257d7a62712318c31fc016eabc2e9fafd (patch) | |
| tree | 849f34489f3b110b75d56cdd6bb1300c38f21c46 /pkgtools/x11-links | |
| parent | e63adaddbbb00ec1a6f9e804966f1ed25f9e3e68 (diff) | |
| download | pkgsrc-cd15812257d7a62712318c31fc016eabc2e9fafd.tar.gz | |
revert buildlink2.mk merge until Johnny has a chance to look at the issues
Diffstat (limited to 'pkgtools/x11-links')
| -rw-r--r-- | pkgtools/x11-links/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 4df2e22a771..83d04b3e28c 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/08/23 05:22:57 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2002/08/23 14:27:14 abs Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in x11.buildlink.mk to the correct version, @@ -23,13 +23,12 @@ USE_X11= # defined PLIST_SRC= ${WRKDIR}/.PLIST_SRC BUILDLINK_X11_SUBDIR= share/x11-links -USE_BUILDLINK2= # defined -_FOR_X11_LINKS_ONLY= # needed to use x11-links/*.buildlink2.mk +_FOR_X11_LINKS_ONLY=- # needed to use x11-links/buildlink.mk .include "../../mk/bsd.prefs.mk" - + .if !exists(${X11BASE}/include/X11/X.h) -IGNORE= "${PKGNAME} requires X headers to be installed" +IGNORE= "x11-links requires X headers to be installed" .endif do-install: @@ -43,8 +42,8 @@ do-install: ${ECHO} "@unexec ${RM} -rf %D/${BUILDLINK_X11_SUBDIR}" >> ${PLIST_SRC} .if !empty(X11BASE:M*openwin) -. include "openwin.buildlink2.mk" +. include "openwin.buildlink.mk" .else -. include "xfree.buildlink2.mk" +. include "xfree.buildlink.mk" .endif .include "../../mk/bsd.pkg.mk" |