diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
| commit | ca7093842870728d22dde1258798b1704c53ca18 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /databases/mysql4-client | |
| parent | 49f0d0312d389247bf08d1e7c28970e1dfb7508f (diff) | |
| download | pkgsrc-ca7093842870728d22dde1258798b1704c53ca18.tar.gz | |
Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
which are the full option names used to set rpath directives for the
linker and the compiler, respectively. In places were we are invoking
the linker, use "${LINKER_RPATH_FLAG} <path>", where the space is
inserted in case the flag is a word, e.g. -rpath. The default values
of *_RPATH_FLAG are set by the compiler/*.mk files, depending on the
compiler that you use. They may be overridden on a ${OPSYS}-specific
basis by setting _OPSYS_LINKER_RPATH_FLAG and _OPSYS_COMPILER_RPATH_FLAG,
respectively. Garbage-collect _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.
Diffstat (limited to 'databases/mysql4-client')
| -rw-r--r-- | databases/mysql4-client/Makefile | 6 | ||||
| -rw-r--r-- | databases/mysql4-client/Makefile.common | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/databases/mysql4-client/Makefile b/databases/mysql4-client/Makefile index 674799c7cff..65d1dd18f28 100644 --- a/databases/mysql4-client/Makefile +++ b/databases/mysql4-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/07/18 22:57:17 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2004/08/27 06:29:07 jlam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc @@ -9,8 +9,8 @@ CONFLICTS= {mysql-client-[0-9]*,mysql3-client-[0-9]*} .include "Makefile.common" CONFIGURE_ARGS+= --without-server -USE_BUILDLINK3= YES -UNBUILDLINK_FILES= scripts/mysql_config +USE_BUILDLINK3= yes +UNWRAP_FILES= scripts/mysql_config INFO_FILES= mysql.info diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index 40511bd586e..fe92236f5ee 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.11 2004/07/20 04:53:09 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.12 2004/08/27 06:29:07 jlam Exp $ DISTNAME= mysql-4.0.20 CATEGORIES= databases @@ -69,7 +69,7 @@ USE_LANGUAGES= c c++ USE_GNU_TOOLS+= make USE_PERL5= # defined USE_LIBTOOL= # defined -LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql post-extract: cd ${WRKSRC}; \ |