[packages/php.git] / php-DESTDIR.patch

--- php-4.0.5/pear/Makefile.in.wiget	Mon Mar 12 20:35:28 2001
+++ php-4.0.5/pear/Makefile.in	Fri May  4 13:12:17 2001
@@ -94,24 +94,24 @@
 	XML/RPC.php
 
 install-data-local: PEAR.php
-	@if $(mkinstalldirs) $(peardir); then \
+	@if $(mkinstalldirs) $(DESTDIR)$(peardir); then \
 		for i in $(PEAR_SUBDIRS); do \
-			(set -x;$(mkinstalldirs) $(peardir)/$$i); \
+			(set -x;$(mkinstalldirs) $(DESTDIR)$(peardir)/$$i); \
 		done; \
 		for i in $(PEAR_FILES); do \
 			dir=`echo $$i|sed 's%[^/][^/]*$$%%'`; \
-			(set -x;$(INSTALL_DATA) $(srcdir)/$$i $(peardir)/$$dir); \
+			(set -x;$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(peardir)/$$dir); \
 		done; \
 		for i in PEAR.php; do \
-			(set -x;$(INSTALL_DATA) $$i $(peardir)); \
+			(set -x;$(INSTALL_DATA) $$i $(DESTDIR)$(peardir)); \
 		done; \
 	else \
 		cat $(srcdir)/install-pear.txt; \
 		exit 5; \
 	fi
 
-phpincludedir = $(includedir)/php
-phpbuilddir = $(prefix)/lib/php/build
+phpincludedir = $(includedir)/php4
+phpbuilddir = $(prefix)/lib/php4/build
 
 BUILD_FILES = \
 	pear/pear.m4 \
@@ -131,15 +131,15 @@
 bin_SCRIPTS = phpize php-config pear
 
 install-build:
-	$(mkinstalldirs) $(phpbuilddir) $(bindir) && \
-	(cd $(top_srcdir) && cp $(BUILD_FILES) $(phpbuilddir))
+	$(mkinstalldirs) $(DESTDIR)$(phpbuilddir) $(DESTDIR)$(bindir) && \
+	(cd $(top_srcdir) && cp $(BUILD_FILES) $(DESTDIR)$(phpbuilddir))
 
 install-programs:
 	for prog in $(bin_SCRIPTS); do \
-		$(INSTALL) -m 755 scripts/$$prog $(bindir)/$$prog; \
+		$(INSTALL) -m 755 scripts/$$prog $(DESTDIR)$(bindir)/$$prog; \
 	done; \
 	for prog in phpextdist; do \
-		$(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(bindir)/$$prog; \
+		$(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(DESTDIR)$(bindir)/$$prog; \
 	done
 
 HEADER_DIRS = \
@@ -155,13 +155,13 @@
 
 install-headers:
 	-@for i in $(HEADER_DIRS); do \
-		paths="$$paths $(phpincludedir)/$$i"; \
+		paths="$$paths $(DESTDIR)$(phpincludedir)/$$i"; \
 	done; \
 	$(mkinstalldirs) $$paths && \
 	echo "creating header file hierarchy" && \
 	for i in $(HEADER_DIRS); do \
-		(cd $(top_srcdir)/$$i && cp -p *.h $(phpincludedir)/$$i; \
-		cd $(top_builddir)/$$i && cp -p *.h $(phpincludedir)/$$i) 2>/dev/null || true; \
+		(cd $(top_srcdir)/$$i && cp -p *.h $(DESTDIR)$(phpincludedir)/$$i; \
+		cd $(top_builddir)/$$i && cp -p *.h $(DESTDIR)$(phpincludedir)/$$i) 2>/dev/null || true; \
 	done
 
 Makefile: Makefile.in $(top_builddir)/config.status
--- php-4.0.5/Makefile.in.wiget	Tue Mar 20 19:15:10 2001
+++ php-4.0.5/Makefile.in	Fri May  4 13:09:20 2001
@@ -1,4 +1,4 @@
-
+DESTDIR =
 ZEND_DIR = $(srcdir)/Zend
 SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
 
@@ -32,7 +32,7 @@
 
 install-sapi:
 	@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
-	-@$(mkinstalldirs) $(bindir)
+	-@$(mkinstalldirs) $(DESTDIR)$(bindir)
 	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
 		for i in 0.0.0 0.0 0; do \
 			if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
@@ -45,10 +45,10 @@
 
 install-modules:
 	@test -d modules && \
-	$(mkinstalldirs) $(moduledir) && \
+	$(mkinstalldirs) $(DESTDIR)$(moduledir) && \
 	echo "installing shared modules into $(moduledir)" && \
 	rm -f modules/*.la && \
-	cp modules/* $(moduledir) >/dev/null 2>&1 || true
+	cp modules/* $(DESTDIR)$(moduledir) >/dev/null 2>&1 || true
 
 install-su: install-modules
 	(cd pear && $(MAKE) install)
Commit	Line	Data
9baa4b06 AF	1	--- php-4.0.5/pear/Makefile.in.wiget Mon Mar 12 20:35:28 2001
	2	+++ php-4.0.5/pear/Makefile.in Fri May 4 13:12:17 2001
	3	@@ -94,24 +94,24 @@
	4	XML/RPC.php
0c4981f1 AF	5
	6	install-data-local: PEAR.php
	7	- @if $(mkinstalldirs) $(peardir); then \
	8	+ @if $(mkinstalldirs) $(DESTDIR)$(peardir); then \
	9	for i in $(PEAR_SUBDIRS); do \
	10	- (set -x;$(mkinstalldirs) $(peardir)/$$i); \
	11	+ (set -x;$(mkinstalldirs) $(DESTDIR)$(peardir)/$$i); \
	12	done; \
	13	for i in $(PEAR_FILES); do \
	14	dir=`echo $$i\|sed 's%[^/][^/]*$$%%'`; \
	15	- (set -x;$(INSTALL_DATA) $(srcdir)/$$i $(peardir)/$$dir); \
	16	+ (set -x;$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(peardir)/$$dir); \
	17	done; \
	18	for i in PEAR.php; do \
	19	- (set -x;$(INSTALL_DATA) $$i $(peardir)); \
	20	+ (set -x;$(INSTALL_DATA) $$i $(DESTDIR)$(peardir)); \
	21	done; \
	22	else \
	23	cat $(srcdir)/install-pear.txt; \
	24	exit 5; \
	25	fi
	26
	27	-phpincludedir = $(includedir)/php
	28	-phpbuilddir = $(prefix)/lib/php/build
	29	+phpincludedir = $(includedir)/php4
	30	+phpbuilddir = $(prefix)/lib/php4/build
	31
	32	BUILD_FILES = \
	33	pear/pear.m4 \
9baa4b06 AF	34	@@ -131,15 +131,15 @@
9baa4b06 AF	35	bin_SCRIPTS = phpize php-config pear
0c4981f1 AF	36
	37	install-build:
	38	- $(mkinstalldirs) $(phpbuilddir) $(bindir) && \
	39	- (cd $(top_srcdir) && cp $(BUILD_FILES) $(phpbuilddir))
	40	+ $(mkinstalldirs) $(DESTDIR)$(phpbuilddir) $(DESTDIR)$(bindir) && \
	41	+ (cd $(top_srcdir) && cp $(BUILD_FILES) $(DESTDIR)$(phpbuilddir))
	42
	43	install-programs:
9baa4b06 AF	44	for prog in $(bin_SCRIPTS); do \
	45	- $(INSTALL) -m 755 scripts/$$prog $(bindir)/$$prog; \
	46	+ $(INSTALL) -m 755 scripts/$$prog $(DESTDIR)$(bindir)/$$prog; \
	47	done; \
	48	for prog in phpextdist; do \
	49	- $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(bindir)/$$prog; \
	50	+ $(INSTALL) -m 755 $(srcdir)/scripts/$$prog $(DESTDIR)$(bindir)/$$prog; \
0c4981f1 AF	51	done
	52
	53	HEADER_DIRS = \
9baa4b06	54	@@ -155,13 +155,13 @@
0c4981f1 AF	55
	56	install-headers:
	57	-@for i in $(HEADER_DIRS); do \
	58	- paths="$$paths $(phpincludedir)/$$i"; \
	59	+ paths="$$paths $(DESTDIR)$(phpincludedir)/$$i"; \
	60	done; \
	61	$(mkinstalldirs) $$paths && \
	62	echo "creating header file hierarchy" && \
	63	for i in $(HEADER_DIRS); do \
	64	- (cd $(top_srcdir)/$$i && cp -p *.h $(phpincludedir)/$$i; \
	65	- cd $(top_builddir)/$$i && cp -p *.h $(phpincludedir)/$$i) 2>/dev/null \|\| true; \
	66	+ (cd $(top_srcdir)/$$i && cp -p *.h $(DESTDIR)$(phpincludedir)/$$i; \
	67	+ cd $(top_builddir)/$$i && cp -p *.h $(DESTDIR)$(phpincludedir)/$$i) 2>/dev/null \|\| true; \
	68	done
	69
	70	Makefile: Makefile.in $(top_builddir)/config.status
9baa4b06 AF	71	--- php-4.0.5/Makefile.in.wiget Tue Mar 20 19:15:10 2001
	72	+++ php-4.0.5/Makefile.in Fri May 4 13:09:20 2001
	73	@@ -1,4 +1,4 @@
	74	-
	75	+DESTDIR =
	76	ZEND_DIR = $(srcdir)/Zend
	77	SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
	78
	79	@@ -32,7 +32,7 @@
	80
	81	install-sapi:
	82	@$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
	83	- -@$(mkinstalldirs) $(bindir)
	84	+ -@$(mkinstalldirs) $(DESTDIR)$(bindir)
	85	-@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
	86	for i in 0.0.0 0.0 0; do \
	87	if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
	88	@@ -45,10 +45,10 @@
	89
	90	install-modules:
	91	@test -d modules && \
	92	- $(mkinstalldirs) $(moduledir) && \
	93	+ $(mkinstalldirs) $(DESTDIR)$(moduledir) && \
	94	echo "installing shared modules into $(moduledir)" && \
	95	rm -f modules/*.la && \
	96	- cp modules/* $(moduledir) >/dev/null 2>&1 \|\| true
	97	+ cp modules/* $(DESTDIR)$(moduledir) >/dev/null 2>&1 \|\| true
	98
	99	install-su: install-modules
	100	(cd pear && $(MAKE) install)