Disable X support, fixes compilation errors

[openwrt.git] / openwrt / package / php4 / Makefile

diff --git a/openwrt/package/php4/Makefile b/openwrt/package/php4/Makefile
index 2644aa4..75664ad 100644 (file)
--- a/openwrt/package/php4/Makefile
+++ b/openwrt/package/php4/Makefile
@@ -63,7 +63,7 @@ endif
 ifneq ($(BR2_PACKAGE_PHP4_MOD_GD),)
 PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_DIR)/usr" \
        --without-freetype-dir \
 ifneq ($(BR2_PACKAGE_PHP4_MOD_GD),)
 PKG_CONFIGURE_OPTS+= --with-gd=shared,"$(STAGING_DIR)/usr" \
        --without-freetype-dir \

-       --without-jpeg-dir \
+       --with-jpeg-dir="$(STAGING_DIR)/usr" \

        --with-png-dir="$(STAGING_DIR)/usr" \
        --without-xpm-dir \
        --without-ttf \
        --with-png-dir="$(STAGING_DIR)/usr" \
        --without-xpm-dir \
        --without-ttf \


@@ -263,7 +263,7 @@ $(IPKG_PHP4_CLI):
        install -m0755 -d $(IDIR_PHP4_CLI)/etc
        install -m0644 ./files/php.ini $(IDIR_PHP4_CLI)/etc/
        install -m0755 -d $(IDIR_PHP4_CLI)/usr/bin
        install -m0755 -d $(IDIR_PHP4_CLI)/etc
        install -m0644 ./files/php.ini $(IDIR_PHP4_CLI)/etc/
        install -m0755 -d $(IDIR_PHP4_CLI)/usr/bin

-       cp -fpR $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP4_CLI)/usr/bin/php
+       $(CP) $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP4_CLI)/usr/bin/php

        $(RSTRIP) $(IDIR_PHP4_CLI)
        $(IPKG_BUILD) $(IDIR_PHP4_CLI) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_PHP4_CLI)
        $(IPKG_BUILD) $(IDIR_PHP4_CLI) $(PACKAGE_DIR)
 


@@ -271,7 +271,7 @@ $(IPKG_PHP4_CGI):
        install -m0755 -d $(IDIR_PHP4_CGI)/etc
        install -m0644 ./files/php.ini $(IDIR_PHP4_CGI)/etc/
        install -m0755 -d $(IDIR_PHP4_CGI)/usr/bin
        install -m0755 -d $(IDIR_PHP4_CGI)/etc
        install -m0644 ./files/php.ini $(IDIR_PHP4_CGI)/etc/
        install -m0755 -d $(IDIR_PHP4_CGI)/usr/bin

-       cp -fpR $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP4_CGI)/usr/bin/php
+       $(CP) $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP4_CGI)/usr/bin/php

        $(RSTRIP) $(IDIR_PHP4_CGI)
        $(IPKG_BUILD) $(IDIR_PHP4_CGI) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_PHP4_CGI)
        $(IPKG_BUILD) $(IDIR_PHP4_CGI) $(PACKAGE_DIR)
 


@@ -281,7 +281,7 @@ $(IPKG_PHP4_FASTCGI):
        install -m0755 -d $(IDIR_PHP4_FASTCGI)/etc/init.d
        install -m0755 ./files/php.init $(IDIR_PHP4_FASTCGI)/etc/init.d/php
        install -m0755 -d $(IDIR_PHP4_FASTCGI)/usr/sbin
        install -m0755 -d $(IDIR_PHP4_FASTCGI)/etc/init.d
        install -m0755 ./files/php.init $(IDIR_PHP4_FASTCGI)/etc/init.d/php
        install -m0755 -d $(IDIR_PHP4_FASTCGI)/usr/sbin

-       cp -fpR $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP4_FASTCGI)/usr/sbin/php
+       $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP4_FASTCGI)/usr/sbin/php

        $(RSTRIP) $(IDIR_PHP4_FASTCGI)
        $(IPKG_BUILD) $(IDIR_PHP4_FASTCGI) $(PACKAGE_DIR)
 
        $(RSTRIP) $(IDIR_PHP4_FASTCGI)
        $(IPKG_BUILD) $(IDIR_PHP4_FASTCGI) $(PACKAGE_DIR)