Mercurial Mercurial > sustaining > oi_151a > sfw-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
usr/src/cmd/php5/patches/pear_Makefile_global.patch
author Jon Tibble <meths@btinternet.com>
Wed, 13 Feb 2013 10:12:56 +0000
branchoi_151a
changeset 198 be4eee29f428
parent 0 b34509ac961f
permissions -rw-r--r--
Bump PHP to 5.2.17
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     1
 
--- build/Makefile.global.ORIG	Mon Jul  7 16:18:04 2008
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     2
 
+++ build/Makefile.global	Mon Jul  7 16:22:56 2008
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     3
 
@@ -1,6 +1,8 @@
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     4
 
 mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     5
 
 INSTALL = $(top_srcdir)/build/shtool install -c
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     6
 
 INSTALL_DATA = $(INSTALL) -m 644
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     7
 
+PECL_EXTENSION_DIR=/var/php/5.2/modules
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     8
 
+PECL_INCLUDE_DIR=/var/php/5.2/include
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     9
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    10
 
 DEFS = -DPHP_ATOM_INC -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    11
 
 COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
198
be4eee29f428 Bump PHP to 5.2.17
Jon Tibble <meths@btinternet.com>
parents: 0
diff changeset 
    12
 
@@ -37,19 +39,19 @@
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    13
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    14
 
 install-modules: build-modules
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    15
 
 	@test -d modules && \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    16
 
-	$(mkinstalldirs) $(INSTALL_ROOT)$(EXTENSION_DIR)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    17
 
-	@echo "Installing shared extensions:     $(INSTALL_ROOT)$(EXTENSION_DIR)/"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    18
 
+	$(mkinstalldirs) $(INSTALL_ROOT)$(PECL_EXTENSION_DIR)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    19
 
+	@echo "Installing shared extensions:     $(INSTALL_ROOT)$(PECL_EXTENSION_DIR)/"
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    20
 
 	@rm -f modules/*.la >/dev/null 2>&1
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    21
 
-	@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    22
 
+	@$(INSTALL) modules/* $(INSTALL_ROOT)$(PECL_EXTENSION_DIR)
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    23
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    24
 
 install-headers:
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    25
 
 	-@if test "$(INSTALL_HEADERS)"; then \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    26
 
 		for i in `echo $(INSTALL_HEADERS)`; do \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    27
 
 			i=`$(top_srcdir)/build/shtool path -d $$i`; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    28
 
-			paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    29
 
+			paths="$$paths $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i"; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    30
 
 		done; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    31
 
 		$(mkinstalldirs) $$paths && \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    32
 
-		echo "Installing header files:          $(INSTALL_ROOT)$(phpincludedir)/" && \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    33
 
+		echo "Installing header files:          $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/" && \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    34
 
 		for i in `echo $(INSTALL_HEADERS)`; do \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    35
 
 			if test "$(PHP_PECL_EXTENSION)"; then \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    36
 
 				src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
198
be4eee29f428 Bump PHP to 5.2.17
Jon Tibble <meths@btinternet.com>
parents: 0
diff changeset 
    37
 
@@ -57,12 +59,12 @@
0
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    38
 
 				src=$$i; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    39
 
 			fi; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    40
 
 			if test -f "$(top_srcdir)/$$src"; then \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    41
 
-				$(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    42
 
+				$(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    43
 
 			elif test -f "$(top_builddir)/$$src"; then \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    44
 
-				$(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    45
 
+				$(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    46
 
 			else \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    47
 
-				(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    48
 
-				cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    49
 
+				(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    50
 
+				cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(PECL_INCLUDE_DIR)/$$i) 2>/dev/null || true; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    51
 
 			fi \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    52
 
 		done; \
b34509ac961f Import sfw repo b126
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    53
 
 	fi
sustaining/oi_151a/sfw-gate