diff options
| author | marino <marino@pkgsrc.org> | 2012-05-19 09:51:34 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2012-05-19 09:51:34 +0000 |
| commit | 1e75a01f0eef71e46eb6d9e6824b0b0043311a1a (patch) | |
| tree | 6b15d2e02281caf1ce98b3df8a4ee41da6eb829d /lang | |
| parent | 619d2be21f7014467b4532526876605602b89544 (diff) | |
| download | pkgsrc-1e75a01f0eef71e46eb6d9e6824b0b0043311a1a.tar.gz | |
lang/php53: Fix unwanted directory removal
Replace OWN_DIRS with @pkgdir to avoid unwanted deletion of PHP extension
directory when the only extension is deinstalled.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php53/Makefile | 6 | ||||
| -rw-r--r-- | lang/php53/PLIST | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 9fd27ffa305..69eae16c3a5 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2012/05/09 06:52:51 taca Exp $ +# $NetBSD: Makefile,v 1.28 2012/05/19 09:51:34 marino Exp $ # # We can't omit PKGNAME here to handle PKG_OPTIONS. @@ -26,7 +26,7 @@ CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} MAKE_ENV+= INSTALL_ROOT=${DESTDIR} CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini -OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR} +PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" SUBST_CLASSES+= path SUBST_MESSAGE.path= Fixing common paths. @@ -36,7 +36,7 @@ SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' -INSTALLATION_DIRS+= ${CGIDIR} ${EGDIR} share/php +INSTALLATION_DIRS+= ${CGIDIR} ${EGDIR} share/php ${PHP_EXTENSION_DIR} # Make sure modules can link correctly .if ${OPSYS} == "Darwin" diff --git a/lang/php53/PLIST b/lang/php53/PLIST index dd133925901..0973f391e71 100644 --- a/lang/php53/PLIST +++ b/lang/php53/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2011/08/20 13:55:09 taca Exp $ +@comment $NetBSD: PLIST,v 1.3 2012/05/19 09:51:34 marino Exp $ bin/phar bin/phar.phar bin/php @@ -236,3 +236,4 @@ share/examples/php/php.ini-development share/examples/php/php.ini-production share/php/php.gif @pkgdir include/php/include +@pkgdir ${PHPEXTDIR} |