Permalink
Browse files

Consolidate includes, they are needed for both.

  • Loading branch information...
1 parent 4de2085 commit 5e4aa64138a6f4acbcadc7882c6afc49bba0ac70 @jperkin jperkin committed Jan 31, 2013
Showing with 3 additions and 5 deletions.
  1. +0 −1 percona55-client/Makefile
  2. +3 −0 percona55-client/Makefile.common
  3. +0 −2 percona55-client/buildlink3.mk
  4. +0 −2 percona55-server/Makefile
@@ -33,5 +33,4 @@ post-install:
. endfor
.endif
-.include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@@ -138,4 +138,7 @@ 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"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
@@ -11,8 +11,6 @@ BUILDLINK_PKGSRCDIR.percona-client?= ../../joyent/percona55-client
BUILDLINK_INCDIRS.percona-client?= include/mysql
BUILDLINK_LIBDIRS.percona-client?= lib
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
.endif # PERCONA_CLIENT_BUILDLINK3_MK
BUILDLINK_TREE+= -percona-client
@@ -65,7 +65,5 @@ CXXFLAGS+= -D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
post-extract:
${MV} ${WRKDIR}/${SPHINX}/mysqlse ${WRKSRC}/storage/sphinx
-.include "../../devel/readline/buildlink3.mk"
.include "../../joyent/percona55-client/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

0 comments on commit 5e4aa64

Please sign in to comment.