diff options
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/files/buildlinkX11.rules | 34 |
3 files changed, 19 insertions, 23 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 103c1eab735..de12a4551a5 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.780 2001/07/05 04:58:12 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.781 2001/07/05 17:22:59 jlam Exp $ # # This file is in the public domain. # @@ -143,7 +143,7 @@ MOTIFBASE?= ${X11PREFIX} BUILD_DEPENDS+= xpkgwedge>=1.5:../../pkgtools/xpkgwedge .endif .if defined(USE_BUILDLINK_ONLY) -BUILD_DEPENDS+= buildlink-x11>=0.5:../../pkgtools/buildlink-x11 +BUILD_DEPENDS+= buildlink-x11>=0.6:../../pkgtools/buildlink-x11 BUILDLINK_DIR?= ${WRKDIR}/.buildlink MAKE_ENV+= BUILDLINK_DIR="${BUILDLINK_DIR}" MAKE_ENV+= PKGSRC_CPPFLAGS="${CPPFLAGS}" diff --git a/pkgtools/buildlink-x11/Makefile b/pkgtools/buildlink-x11/Makefile index 050ac00f710..6ffccea0626 100644 --- a/pkgtools/buildlink-x11/Makefile +++ b/pkgtools/buildlink-x11/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2001/07/05 04:47:28 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2001/07/05 17:23:00 jlam Exp $ -DISTNAME= buildlink-x11-0.5 +DISTNAME= buildlink-x11-0.6 CATEGORIES= pkgtools devel x11 MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/buildlink-x11/files/buildlinkX11.rules b/pkgtools/buildlink-x11/files/buildlinkX11.rules index 628c8824dfa..0f353242e8b 100644 --- a/pkgtools/buildlink-x11/files/buildlinkX11.rules +++ b/pkgtools/buildlink-x11/files/buildlinkX11.rules @@ -1,4 +1,6 @@ -/* $NetBSD: buildlinkX11.rules,v 1.1.1.1 2001/07/02 21:00:44 jlam Exp $ */ +/* $NetBSD: buildlinkX11.rules,v 1.2 2001/07/05 17:23:00 jlam Exp $ */ + +#include <X11.rules> #ifdef UseInstalled # ifdef BuildLink @@ -11,24 +13,6 @@ # undef TopXInclude # endif # define TopXInclude -I$(BUILDLINK_DIR)/include -# else -# ifdef TopXInclude -# undef TopXInclude -# endif -# ifdef X11ProjectRoot -# define TopXInclude -I$(XPROJECTROOT)/include -# else -# define TopXInclude -I$(INCROOT) -# endif -# endif /* BuildLinkX11 */ -# endif /* BuildLink */ -#endif /* UseInstalled */ - -#include <X11.rules> - -#ifdef UseInstalled -# ifdef BuildLink -# ifdef BuildLinkX11 # ifdef XLdPreLibs # undef XLdPreLibs # endif @@ -46,6 +30,14 @@ # endif # define LdPostLibs LdPostLib XLdPostLibs # else +# ifdef TopXInclude +# undef TopXInclude +# endif +# ifdef X11ProjectRoot +# define TopXInclude -I$(XPROJECTROOT)/include +# else +# define TopXInclude -I$(INCROOT) +# endif # ifdef XLdPreLibs # undef XLdPreLibs # endif @@ -71,5 +63,9 @@ # endif # define LdPostLibs LdPostLib XLdPostLibs # endif /* BuildLinkX11 */ +# ifdef TopIncludes +# undef TopIncludes +# endif +# define TopIncludes TopInclude $(TOP_X_INCLUDES) # endif /* BuildLink */ #endif /* UseInstalled */ |