Bläddra i källkod

php: only overwrite php.ini if not present in target_skeleton

Allow platforms to provide a custom php.ini in their target_skeleton.
Peter Korsgaard 16 år sedan
förälder
incheckning
ee0bbc04ff
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2 1
      package/php/php.mk

+ 2 - 1
package/php/php.mk

@@ -169,7 +169,8 @@ $(PHP_HOOK_POST_INSTALL):
 	rm -rf $(TARGET_DIR)/usr/lib/php
 	rm -f $(TARGET_DIR)/usr/bin/phpize
 	rm -f $(TARGET_DIR)/usr/bin/php-config
-	$(INSTALL) -m 0755 $(BR2_PACKAGE_PHP_CONFIG) $(TARGET_DIR)/etc/php.ini
+	if [ ! -f $(TARGET_DIR)/etc/php.ini ]; then \
+		$(INSTALL) -m 0755 $(BR2_PACKAGE_PHP_CONFIG) $(TARGET_DIR)/etc/php.ini; fi
 
 $(PHP_TARGET_UNINSTALL):
 	$(call MESSAGE,"Uninstalling")