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