diff options
| author | joerg <joerg> | 2013-06-18 19:59:35 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-06-18 19:59:35 +0000 |
| commit | 3e55c03b9da1f38231d936c7a10ea976379dd668 (patch) | |
| tree | 4e91603771f4fef050eb9f35e958b40b5292f440 /databases | |
| parent | 4967a2a9d5d244e546f7e34a12b03e3da4351326 (diff) | |
| download | pkgsrc-3e55c03b9da1f38231d936c7a10ea976379dd668.tar.gz | |
Server needs the same changes as client to not build the integrated
editline, so move them to Makefile.common.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql56-client/Makefile | 12 | ||||
| -rw-r--r-- | databases/mysql56-client/Makefile.common | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile index 5544f763ce8..a7d1c9afab1 100644 --- a/databases/mysql56-client/Makefile +++ b/databases/mysql56-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/06/16 20:39:12 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2013/06/18 19:59:35 joerg Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} SVR4_PKGNAME= mysqc @@ -35,14 +35,4 @@ post-install: . endfor .endif -.include "../../devel/readline/buildlink3.mk" - -CMAKE_ARGS+= -DWITH_EDITLINE=system -.if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) && !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) -CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libedit.so -.else -CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libreadline.so -.endif -CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.readline}/include/readline - .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common index 10f19494370..bfd9fa7b0b3 100644 --- a/databases/mysql56-client/Makefile.common +++ b/databases/mysql56-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2013/06/16 20:39:12 joerg Exp $ +# $NetBSD: Makefile.common,v 1.7 2013/06/18 19:59:35 joerg Exp $ # # used by databases/mysql56-client/Makefile # used by databases/mysql56-server/Makefile @@ -111,4 +111,14 @@ SUBST_SED.scr= -e "s,chown,${CHOWN},g" SUBST_SED.scr+= -e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g" SUBST_MESSAGE.scr= Fixing scripts. +.include "../../devel/readline/buildlink3.mk" + +CMAKE_ARGS+= -DWITH_EDITLINE=system +.if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) && !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS]) +CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libedit.so +.else +CMAKE_ARGS+= -DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libreadline.so +.endif +CMAKE_ARGS+= -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.readline}/include/readline + .include "../../devel/zlib/buildlink3.mk" |