From 1ecc71c7bb12e258a3afc0eac6fd1f998cdefb6f Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 24 Jul 2006 14:11:13 +0000
Subject: Move zlib SUBST magic to Makefile.common, it is always needed. Fixes
 problems found by abs@

---
 meta-pkgs/xorg/Makefile.common | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'meta-pkgs')

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)
-- 
cgit v1.2.3