summaryrefslogtreecommitdiff
path: root/meta-pkgs
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-07-24 14:11:13 +0000
committerjoerg <joerg@pkgsrc.org>2006-07-24 14:11:13 +0000
commit1ecc71c7bb12e258a3afc0eac6fd1f998cdefb6f (patch)
treed4fc1d0e42298008571f9deac37ace5019ed6f15 /meta-pkgs
parentca6d9143a4f346442b8ae72f9a62d5ec53990ae8 (diff)
downloadpkgsrc-1ecc71c7bb12e258a3afc0eac6fd1f998cdefb6f.tar.gz
Move zlib SUBST magic to Makefile.common, it is always needed.
Fixes problems found by abs@
Diffstat (limited to 'meta-pkgs')
-rw-r--r--meta-pkgs/xorg/Makefile.common9
1 files changed, 8 insertions, 1 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)