From 8c67971aa86891f9174ee16f93cd21d615fba481 Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Mon, 24 Nov 2014 10:30:56 +0000 Subject: [PATCH] Remove obsolete @dirrm and similar. --- Mk/bsd.php.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk index 060017aac80c..47578c4e8417 100644 --- a/Mk/bsd.php.mk +++ b/Mk/bsd.php.mk @@ -211,12 +211,8 @@ add-plist-info: add-plist-phpext add-plist-phpext: @${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so" \ >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/lib/php/${PHP_EXT_DIR} 2> /dev/null || true" \ - >> ${TMPPLIST} @${FIND} -P ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME} ! -type d 2>/dev/null | \ ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,,p' >> ${TMPPLIST} - @${FIND} -P -d ${STAGEDIR}${PREFIX}/include/php/ext/${PHP_MODNAME} -type d 2>/dev/null | \ - ${SED} -ne 's,^${STAGEDIR}${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} @${ECHO_CMD} "@exec echo \#include \\\"ext/${PHP_MODNAME}/config.h\\\" >> %D/include/php/ext/php_config.h" \ >> ${TMPPLIST} @${ECHO_CMD} "@unexec cp %D/include/php/ext/php_config.h %D/include/php/ext/php_config.h.orig" \ @@ -225,7 +221,7 @@ add-plist-phpext: >> ${TMPPLIST} @${ECHO_CMD} "@unexec rm %D/include/php/ext/php_config.h.orig" \ >> ${TMPPLIST} - @${ECHO_CMD} "@exec mkdir -p %D/etc/php" \ + @${ECHO_CMD} "@dir etc/php" \ >> ${TMPPLIST} .if defined(USE_ZENDEXT) @${ECHO_CMD} "@exec echo zend_extension=%D/lib/php/${PHP_EXT_DIR}/${PHP_MODNAME}.so >> %D/etc/php/extensions.ini" \ @@ -247,8 +243,6 @@ add-plist-phpext: >> ${TMPPLIST} @${ECHO_CMD} "@unexec [ -s %D/etc/php/extensions.ini ] || rm %D/etc/php/extensions.ini" \ >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/etc/php 2> /dev/null || true" \ - >> ${TMPPLIST} package-message: php-ini