components/php-5_3/php-sapi/patches-other/pear_Makefile_global.patch
changeset 4987 6a82655eda42
parent 4986 90a869b3f47a
child 4988 4b69c7c7e09b
--- a/components/php-5_3/php-sapi/patches-other/pear_Makefile_global.patch	Fri Oct 16 07:42:27 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
---- Makefile.global.orig	Fri Dec  9 14:38:38 2011
-+++ Makefile.global	Mon Dec 12 14:26:29 2011
-@@ -1,6 +1,8 @@
- mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
- INSTALL = $(top_srcdir)/build/shtool install -c
- INSTALL_DATA = $(INSTALL) -m 644
-+PECL_EXTENSION_DIR=/var/php/5.3/modules
-+PECL_INCLUDE_DIR=/var/php/5.3/include
- 
- DEFS = -DPHP_ATOM_INC $(CPP_LARGEFILES) -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
- COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
-@@ -37,19 +39,19 @@
- 
- install-modules: build-modules
- 	@test -d modules && \
--	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
--	@echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/"
-+	$(mkinstalldirs) $(INSTALL_ROOT)$(PECL_EXTENSION_DIR)
-+	@echo "Installing shared extensions:     $(INSTALL_ROOT)$(PECL_EXTENSION_DIR)/"
- 	@rm -f modules/*.la >/dev/null 2>&1
--	@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
-+	@$(INSTALL) modules/* $(INSTALL_ROOT)$(PECL_EXTENSION_DIR)
- 
- install-headers:
- 	-@if test "$(INSTALL_HEADERS)"; then \
- 		for i in `echo $(INSTALL_HEADERS)`; do \
- 			i=`$(top_srcdir)/build/shtool path -d $$i`; \
--			paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
-+			paths="$$paths $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i"; \
- 		done; \
- 		$(mkinstalldirs) $$paths && \
--		echo "Installing header files:          $(INSTALL_ROOT)$(phpincludedir)/" && \
-+		echo "Installing header files:          $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/" && \
- 		for i in `echo $(INSTALL_HEADERS)`; do \
- 			if test "$(PHP_PECL_EXTENSION)"; then \
- 				src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
-@@ -57,12 +59,12 @@
- 				src=$$i; \
- 			fi; \
- 			if test -f "$(top_srcdir)/$$src"; then \
--				$(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
-+				$(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i; \
- 			elif test -f "$(top_builddir)/$$src"; then \
--				$(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
-+				$(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i; \
- 			else \
--				(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \
--				cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
-+				(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i; \
-+				cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i) 2>/dev/null || true; \
- 			fi \
- 		done; \
- 	fi