diff options
| author | jlam <jlam> | 2001-07-05 17:22:59 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-07-05 17:22:59 +0000 |
| commit | a7f94e147ad4dff87379c60bc2262bbec722a09e (patch) | |
| tree | 3c51879b8727afa7ee4b9fb0b7fba21f470170e9 /pkgtools | |
| parent | 357ae12386d57efd32e541ed10dc8593b19e66ae (diff) | |
| download | pkgsrc-a7f94e147ad4dff87379c60bc2262bbec722a09e.tar.gz | |
Update buildlink-x11 to 0.6. Changes include moving the custom overrides
of X11.rules settings below the inclusion of <X11.rules>. This should
cause overrides to work correct for XFree-3.3.x systems.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/buildlink-x11/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/buildlink-x11/files/buildlinkX11.rules | 34 |
2 files changed, 17 insertions, 21 deletions
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 */ |