diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2004-11-16 18:01:11 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2004-11-16 18:01:11 +0000 |
commit | e64842ed6cc5e7ffeb916a819bb5e720d9eb9c19 (patch) | |
tree | 5002d8d2a5129ceada1ce536943040f92a14cdc3 /databases | |
parent | 2e5cf5a74e1016e0277327e001d54a5cda268930 (diff) | |
download | pkgsrc-e64842ed6cc5e7ffeb916a819bb5e720d9eb9c19.tar.gz |
Use subst.mk for last tron@'s changes, no functional changes.
Diffstat (limited to 'databases')
-rw-r--r-- | databases/mysql-client/Makefile | 8 | ||||
-rw-r--r-- | databases/mysql-client/Makefile.common | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index d65586a93b2..13c5e18d2dc 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2004/11/16 17:29:36 tron Exp $ +# $NetBSD: Makefile,v 1.37 2004/11/16 18:01:11 xtraeme Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc @@ -17,12 +17,6 @@ UNWRAP_FILES= scripts/mysql_config INFO_FILES= mysql.info -post-configure: - ${SED} -e 's#${PTHREAD_CFLAGS}##g' -e 's#${PTHREAD_LDFLAGS}##g' \ - -e 's#${PTHREAD_LIBS}##g' ${WRKSRC}/libmysql/Makefile \ - >${WRKSRC}/libmysql/Makefile.new - ${MV} ${WRKSRC}/libmysql/Makefile.new ${WRKSRC}/libmysql/Makefile - post-install: ${INSTALL_DATA} ${WRKSRC}/Docs/mysql.info ${PREFIX}/info diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 0da85a2035f..6b78b1f740a 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2004/11/16 17:29:36 tron Exp $ +# $NetBSD: Makefile.common,v 1.32 2004/11/16 18:01:11 xtraeme Exp $ DISTNAME= mysql-4.0.22 CATEGORIES= databases @@ -102,6 +102,11 @@ SUBST_STAGE.scripts= post-extract SUBST_FILES.scripts= scripts/mysql_install_db.sh scripts/mysqld_safe.sh SUBST_SED.scripts= -e "s,chown,${CHOWN},g" SUBST_MESSAGE.scripts= "Fixing scripts." +SUBST_STAGE.thr= post-configure +SUBST_FILES.thr= libmysql/Makefile +SUBST_SED.thr= -e "s,${PTHREAD_CFLAGS},,g" \ + -e "s,${PTHREAD_LDFLAGS},,g" \ + -e "s,${PTHREAD_LIBS},,g" .include "../../security/openssl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" |