[Pkg-php-commits] r1030 - php5/trunk/debian

[Raphael Geissert]

tags 463979 pending
thanks

Author: atomo64-guest
Date: 2008-05-01 06:36:43 +0000 (Thu, 01 May 2008)
New Revision: 1030

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/rules
Log:
Set our custom PHP_PEAR_DOWNLOAD_DIR when building the pear stuff
 + Avoids the creation of /tmp/pear (Closes: #463979)
Replaced all 'make' with '$(MAKE)' so any extra flag is preserve


Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2008-05-01 06:10:21 UTC (rev 1029)
+++ php5/trunk/debian/changelog	2008-05-01 06:36:43 UTC (rev 1030)
@@ -29,12 +29,15 @@
   * Override the following lintian messages:
     + SAPI packages package-contains-empty-directory usr/lib/php5/20060613+lfs/
     + php5-common package-contains-empty-directory usr/lib/php5/libexec/
+  * Set our custom PHP_PEAR_DOWNLOAD_DIR when building the pear stuff
+    + Avoids the creation of /tmp/pear (Closes: #463979)
+  * Replaced all 'make' with '$(MAKE)' so any extra flag is preserved
 
   [ Steve Langasek ]
   * Step down from the PHP maintenance team, removing myself from uploaders.
     So long, and thanks for all the fish!
 
- -- Raphael Geissert <atomo64 at gmail.com>  Thu, 01 May 2008 01:08:02 -0500
+ -- Raphael Geissert <atomo64 at gmail.com>  Thu, 01 May 2008 01:33:43 -0500
 
 php5 (5.2.5-3) unstable; urgency=high
 

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2008-05-01 06:10:21 UTC (rev 1029)
+++ php5/trunk/debian/rules	2008-05-01 06:36:43 UTC (rev 1030)
@@ -168,7 +168,8 @@
 build-pear-stamp: build-cgi-stamp
 	dh_testdir
 	-mkdir pear-build
-	cd cgi-build && make install-pear PHP_PEAR_PHP_BIN=/usr/bin/php PHP_PEAR_INSTALL_DIR=/usr/share/php PHP_PEAR_SYSCONF_DIR=/etc/pear PHP_PEAR_SIG_BIN=/usr/bin/gpg INSTALL_ROOT=$(CURDIR)/pear-build
+	-mkdir pear-build-download
+	cd cgi-build && PHP_PEAR_DOWNLOAD_DIR=$(CURDIR)/pear-build-download $(MAKE) install-pear PHP_PEAR_PHP_BIN=/usr/bin/php PHP_PEAR_INSTALL_DIR=/usr/share/php PHP_PEAR_SYSCONF_DIR=/etc/pear PHP_PEAR_SIG_BIN=/usr/bin/gpg INSTALL_ROOT=$(CURDIR)/pear-build
 	sed -i -e 's/-d output_buffering=1 -d open_basedir="" -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
 	       $(CURDIR)/pear-build/usr/bin/pear && \
 	sed -i -e 's/-d output_buffering=1 -d safe_mode=0/-d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit="-1"/' \
@@ -290,7 +291,7 @@
 	rm -rf apache2-build
 	rm -rf cgi-build
 	rm -rf cli-build
-	rm -rf pear-build
+	rm -rf pear-build pear-build-download
 	rm -f debian/copyright
 	rm -f test-results.txt
 	dh_clean
@@ -331,7 +332,7 @@
 	cp test-results.txt debian/php5-common/usr/share/doc/php5-common/
 
 	# install the apache modules' files
-	cd apache2-build && make install-headers install-build install-modules install-programs INSTALL_ROOT=$(CURDIR)/debian/libapache2-mod-php5
+	cd apache2-build && $(MAKE) install-headers install-build install-modules install-programs INSTALL_ROOT=$(CURDIR)/debian/libapache2-mod-php5
 	# remove netware and win32 headers that we don't want
 	cd debian/libapache2-mod-php5/usr/include/php5/ && \
 		  rm -f TSRM/readdir.h \