diff options
author | taca <taca@pkgsrc.org> | 2013-07-29 03:59:44 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2013-07-29 03:59:44 +0000 |
commit | 2cf0bfe873c70e997cd6c54791bca7804c65cd46 (patch) | |
tree | 77e56cd6626851cb3674abc4df6ddbcea956da9f /lang | |
parent | ec75cb7b366859ff0c52084221c3196e83d55732 (diff) | |
download | pkgsrc-2cf0bfe873c70e997cd6c54791bca7804c65cd46.tar.gz |
Move PHP_CHECK_INSTALLED to before including Makefile.php since it should
be defined before including lang/php/phpversion.mk.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/php53/Makefile | 3 | ||||
-rw-r--r-- | lang/php53/Makefile.common | 3 | ||||
-rw-r--r-- | lang/php54/Makefile | 3 | ||||
-rw-r--r-- | lang/php54/Makefile.common | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 09a6e487d86..221cd1289a7 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2013/03/16 01:58:17 taca Exp $ +# $NetBSD: Makefile,v 1.40 2013/07/29 03:59:44 taca Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -14,6 +14,7 @@ TEST_TARGET= test USE_TOOLS+= gmake lex pkg-config LIBTOOL_OVERRIDE= # empty +PHP_CHECK_INSTALLED= No .include "Makefile.php" diff --git a/lang/php53/Makefile.common b/lang/php53/Makefile.common index 5f7f1ca4b8c..bcd43f6fbe4 100644 --- a/lang/php53/Makefile.common +++ b/lang/php53/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2013/07/21 17:29:47 taca Exp $ +# $NetBSD: Makefile.common,v 1.29 2013/07/29 03:59:44 taca Exp $ # used by lang/php53/Makefile.php # used by lang/php/ext.mk # used by meta-pkgs/php53-extensions/Makefile @@ -13,7 +13,6 @@ PHP_VERSION_REQD= 53 PHP_BASE_VERS= ${PHP53_VERSION} -PHP_CHECK_INSTALLED= No .include "../../lang/php/common.mk" diff --git a/lang/php54/Makefile b/lang/php54/Makefile index 29e5d658932..67b1722d2a9 100644 --- a/lang/php54/Makefile +++ b/lang/php54/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/03/16 01:58:53 taca Exp $ +# $NetBSD: Makefile,v 1.9 2013/07/29 04:20:55 taca Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -14,6 +14,7 @@ TEST_TARGET= test USE_TOOLS+= gmake lex pkg-config LIBTOOL_OVERRIDE= # empty +PHP_CHECK_INSTALLED= No .include "Makefile.php" diff --git a/lang/php54/Makefile.common b/lang/php54/Makefile.common index 6b102469f4f..17e8c818ac7 100644 --- a/lang/php54/Makefile.common +++ b/lang/php54/Makefile.common @@ -1,11 +1,10 @@ -# $NetBSD: Makefile.common,v 1.15 2013/07/21 17:29:47 taca Exp $ +# $NetBSD: Makefile.common,v 1.16 2013/07/29 04:20:55 taca Exp $ # used by lang/php54/Makefile.php # used by lang/php/ext.mk # used by meta-pkgs/php54-extensions/Makefile PHP_VERSION_REQD= 54 PHP_BASE_VERS= ${PHP54_VERSION} -PHP_CHECK_INSTALLED= No .include "../../lang/php/common.mk" |