diff options
| author | jlam <jlam> | 2001-07-01 21:13:20 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-07-01 21:13:20 +0000 |
| commit | cf4a5a716b33c0514a72735bf2a22d4808279896 (patch) | |
| tree | 2220600c4d41797ef5b463cb9d259b5d0685e102 | |
| parent | 03713a3d2686aa51dea6aaf2bd33ba533ffde32c (diff) | |
| download | pkgsrc-cf4a5a716b33c0514a72735bf2a22d4808279896.tar.gz | |
Make sure the -DBuildLink gets passed through to subdir Imakefiles if
BuildLink is defined. Bump xpkgwedge version number to 1.4 and increase
xpkgwedge dependency version in bsd.pkg.mk.
| -rw-r--r-- | mk/bsd.pkg.mk | 4 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/files/xpkgwedge.def | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 23a09a280f0..a71e91f5754 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.773 2001/06/30 03:36:48 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.774 2001/07/01 21:13:20 jlam Exp $ # # This file is in the public domain. # @@ -132,7 +132,7 @@ MOTIFBASE?= ${X11PREFIX} .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE) .if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \ exists(${X11BASE}/lib/X11/config/xpkgwedge.def) -BUILD_DEPENDS+= xpkgwedge>=1.3:../../pkgtools/xpkgwedge +BUILD_DEPENDS+= xpkgwedge>=1.4:../../pkgtools/xpkgwedge MAKE_ENV+= PKGSRC_CPPFLAGS="${CPPFLAGS}" MAKE_ENV+= PKGSRC_CFLAGS="${CFLAGS}" MAKE_ENV+= PKGSRC_CXXFLAGS="${CXXFLAGS}" diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 29b667c073c..30ff637c0a0 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2001/06/29 18:27:30 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2001/07/01 21:13:21 jlam Exp $ # -DISTNAME= xpkgwedge-1.3 +DISTNAME= xpkgwedge-1.4 CATEGORIES= pkgtools devel x11 MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/xpkgwedge/files/xpkgwedge.def b/pkgtools/xpkgwedge/files/xpkgwedge.def index 791a1de197a..71d5962514a 100644 --- a/pkgtools/xpkgwedge/files/xpkgwedge.def +++ b/pkgtools/xpkgwedge/files/xpkgwedge.def @@ -1,4 +1,4 @@ -/* $NetBSD: xpkgwedge.def,v 1.6 2001/06/29 18:27:30 jlam Exp $ */ +/* $NetBSD: xpkgwedge.def,v 1.7 2001/07/01 21:13:21 jlam Exp $ */ #ifdef AfterVendorCF @@ -88,6 +88,8 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class # define LdPreLib BuildLinkLdFlags # undef LdPostLib # define LdPostLib BuildLinkLdFlags +# undef ImakeCmd +# define ImakeCmd imake -DBuildLink -I$(PREFIX)/lib/X11/config #endif #endif /* BuildLink */ |