Fix spelling error, causing php to use host includes, add patching and unpacked targets
authorUlf Samuelsson <ulf.samuelsson@atmel.com>
Sun, 25 Jan 2009 20:59:30 +0000 (20:59 -0000)
committerUlf Samuelsson <ulf.samuelsson@atmel.com>
Sun, 25 Jan 2009 20:59:30 +0000 (20:59 -0000)
package/php/php.mk

index 365edec4a1e9f9f3a4da6e221ee8dd3dbcf4537c..86372ed722fcbc6e264cd1213e4f28e02b50308a 100644 (file)
@@ -87,7 +87,7 @@ ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y)
        PHP_DEPS+=readline
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_NCURSES),y)
-       PHP_CONFIGURE+=--with-ncurses=$(STATING_DIR)/usr
+       PHP_CONFIGURE+=--with-ncurses=$(STAGING_DIR)/usr
        PHP_DEPS+=ncurses
 endif
 ifeq ($(BR2_PACKAGE_PHP_EXT_SYSVMSG),y)
@@ -132,6 +132,8 @@ php-source: $(DL_DIR)/$(PHP_SOURCE)
 
 $(PHP_DIR)/.unpacked: $(DL_DIR)/$(PHP_SOURCE)
        $(PHP_CAT) $(DL_DIR)/$(PHP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+       toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch
+       toolchain/patch-kernel.sh $(PHP_DIR) package/php/ php\*.patch.$(ARCH)
        touch $@
 
 $(PHP_DIR)/.configured: $(PHP_DIR)/.unpacked
@@ -184,6 +186,8 @@ $(TARGET_DIR)/etc/php.ini: $(PHP_DIR)/.staged
 
 php: uclibc $(PHP_DEPS) $(PHP_TARGET_DEPS) $(TARGET_DIR)/etc/php.ini
 
+php-unpacked: $(PHP_DIR)/.unpacked
+
 php-clean:
        rm -f $(PHP_DIR)/.configured $(PHP_DIR)/.built $(PHP_DIR)/.staged
        rm -f $(PHP_TARGET_DEPS)