diff options
| author | joerg <joerg@pkgsrc.org> | 2006-07-24 14:11:13 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-07-24 14:11:13 +0000 |
| commit | 1ecc71c7bb12e258a3afc0eac6fd1f998cdefb6f (patch) | |
| tree | d4fc1d0e42298008571f9deac37ace5019ed6f15 | |
| parent | ca6d9143a4f346442b8ae72f9a62d5ec53990ae8 (diff) | |
| download | pkgsrc-1ecc71c7bb12e258a3afc0eac6fd1f998cdefb6f.tar.gz | |
Move zlib SUBST magic to Makefile.common, it is always needed.
Fixes problems found by abs@
| -rw-r--r-- | meta-pkgs/xorg/Makefile.common | 9 | ||||
| -rw-r--r-- | x11/xorg-libs/Makefile | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index b99a61e42c7..e6c09c62121 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.41 2006/07/04 09:20:18 rillig Exp $ +# $NetBSD: Makefile.common,v 1.42 2006/07/24 14:11:13 joerg Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -221,6 +221,13 @@ SUBST_SED.thr= -e 's|@@NETBSD_THREADLIB@@||' . endif .endif +SUBST_CLASSES+= zlib +SUBST_STAGE.zlib= pre-configure +SUBST_FILES.zlib= config/cf/Imake.tmpl +SUBST_SED.zlib= -e 's|@ZLIBDIR@|${BUILDLINK_PREFIX.zlib}/lib|g' \ + -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g' +SUBST_MESSAGE.zlib= Adding the zlib library path. + USE_LANGUAGES= c c++ . if !target(post-extract) diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index 5ecb1710fd4..5aeecf8ace6 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2006/07/23 15:45:36 minskim Exp $ +# $NetBSD: Makefile,v 1.38 2006/07/24 14:11:13 joerg Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-libs-${XORG_VER} @@ -49,13 +49,6 @@ SUBST_FILES.mkstrs= config/cf/Library.tmpl SUBST_SED.mkstrs= -e 's,@MAKESTRS@,${X11ROOT}/bin/makestrs,g' SUBST_MESSAGE.mkstrs= Fixing path of makestrs. -SUBST_CLASSES+= zlib -SUBST_STAGE.zlib= pre-configure -SUBST_FILES.zlib= config/cf/Imake.tmpl -SUBST_SED.zlib= -e 's|@ZLIBDIR@|${BUILDLINK_PREFIX.zlib}/lib|g' \ - -e 's|@COMPILER_RPATH_FLAG@|${COMPILER_RPATH_FLAG}|g' -SUBST_MESSAGE.zlib= Adding the zlib library path. - post-install: @${SED} ${XORG_PLIST_SED} ${PKGDIR}/PLIST > ${PLIST_SRC} .if ${OPSYS} == "Linux" |