X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/d852d33252c18830bfeee748f8a170339e2853da..deca134d7e72842eed77a7c17b86e7db141f4f86:/openwrt/package/php5/Makefile?ds=sidebyside

diff --git a/openwrt/package/php5/Makefile b/openwrt/package/php5/Makefile
index db863ae4a..176654472 100644
--- a/openwrt/package/php5/Makefile
+++ b/openwrt/package/php5/Makefile
@@ -67,7 +67,7 @@ endif
 ifneq ($(BR2_PACKAGE_PHP5_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 \
@@ -267,7 +267,7 @@ $(IPKG_PHP5_CLI):
 	install -m0755 -d $(IDIR_PHP5_CLI)/etc
 	install -m0644 ./files/php.ini $(IDIR_PHP5_CLI)/etc/
 	install -m0755 -d $(IDIR_PHP5_CLI)/usr/bin
-	cp -fpR $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP5_CLI)/usr/bin/php
+	$(CP) $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP5_CLI)/usr/bin/php
 	$(RSTRIP) $(IDIR_PHP5_CLI)
 	$(IPKG_BUILD) $(IDIR_PHP5_CLI) $(PACKAGE_DIR)
 
@@ -275,7 +275,7 @@ $(IPKG_PHP5_CGI):
 	install -m0755 -d $(IDIR_PHP5_CGI)/etc
 	install -m0644 ./files/php.ini $(IDIR_PHP5_CGI)/etc/
 	install -m0755 -d $(IDIR_PHP5_CGI)/usr/bin
-	cp -fpR $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP5_CGI)/usr/bin/php
+	$(CP) $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP5_CGI)/usr/bin/php
 	$(RSTRIP) $(IDIR_PHP5_CGI)
 	$(IPKG_BUILD) $(IDIR_PHP5_CGI) $(PACKAGE_DIR)
 
@@ -285,7 +285,7 @@ $(IPKG_PHP5_FASTCGI):
 	install -m0755 -d $(IDIR_PHP5_FASTCGI)/etc/init.d
 	install -m0755 ./files/php.init $(IDIR_PHP5_FASTCGI)/etc/init.d/php
 	install -m0755 -d $(IDIR_PHP5_FASTCGI)/usr/sbin
-	cp -fpR $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP5_FASTCGI)/usr/sbin/php
+	$(CP) $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP5_FASTCGI)/usr/sbin/php
 	$(RSTRIP) $(IDIR_PHP5_FASTCGI)
 	$(IPKG_BUILD) $(IDIR_PHP5_FASTCGI) $(PACKAGE_DIR)