sniper Wed Jun 8 06:34:43 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/scripts Makefile.frag Log: MFH http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.1.2.11.2.3&r2=1.1.2.11.2.4&ty=u Index: php-src/scripts/Makefile.frag diff -u php-src/scripts/Makefile.frag:1.1.2.11.2.3 php-src/scripts/Makefile.frag:1.1.2.11.2.4 --- php-src/scripts/Makefile.frag:1.1.2.11.2.3 Tue Jun 7 17:57:13 2005 +++ php-src/scripts/Makefile.frag Wed Jun 8 06:34:41 2005 @@ -21,7 +21,7 @@ config.sub bin_SCRIPTS = phpize php-config -bin_src_SCRIPTS = +man_PAGES = phpize.1 php-config.1 install-build: @echo "Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/" @@ -32,41 +32,46 @@ HEADER_DIRS = \ / \ - Zend \ - TSRM \ - ext/standard \ - ext/session \ - ext/xml \ - ext/xml/expat \ - main \ - ext/mbstring \ - ext/mbstring/libmbfl \ - ext/mbstring/libmbfl/mbfl \ - ext/pgsql \ - regex + Zend/ \ + TSRM/ \ + include/ \ + main/ \ + regex/ \ + ext/iconv/ \ + ext/pgsql/ \ + ext/standard/ \ + ext/session/ \ + ext/xml/ \ + ext/xml/expat/ \ + ext/mbstring/ \ + ext/mbstring/libmbfl/ \ + ext/mbstring/libmbfl/mbfl/ install-headers: [EMAIL PROTECTED] i in $(HEADER_DIRS); do \ + i=`$(top_srcdir)/build/shtool path -d $$i`; \ paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \ done; \ $(mkinstalldirs) $$paths && \ echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \ for i in $(HEADER_DIRS); do \ - (cd $(top_srcdir)/$$i && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \ - cd $(top_builddir)/$$i && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \ + if test -f "$(top_srcdir)/$$i"; then \ + $(INSTALL_DATA) $(top_srcdir)/$$i $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + elif test -f "$(top_builddir)/$$i"; then \ + $(INSTALL_DATA) $(top_builddir)/$$i $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + else \ + (cd $(top_srcdir)/$$i && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \ + cd $(top_builddir)/$$i && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \ + fi \ done; \ cd $(top_srcdir)/sapi/embed && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/main -install-programs: $(builddir)/phpize $(builddir)/php-config +install-programs: $(builddir)/phpize $(builddir)/php-config @echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/" @for prog in $(bin_SCRIPTS); do \ echo " program: $(program_prefix)$$prog$(program_suffix)"; \ $(INSTALL) -m 755 $(builddir)/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ done - @for prog in $(bin_src_SCRIPTS); do \ - echo " program: $(program_prefix)$$prog$(program_suffix)"; \ - $(INSTALL) -m 755 $(top_srcdir)/scripts/$$prog $(INSTALL_ROOT)$(bindir)/$(program_prefix)$$prog$(program_suffix); \ - done @echo "Installing man pages: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 @for page in $(man_PAGES); do \
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php