diff options
| author | foobar <sniper@php.net> | 2005-10-13 10:04:17 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-10-13 10:04:17 +0000 |
| commit | 27d2fe07ffab419e0d7a09b1191e356785f4253b (patch) | |
| tree | 0d2d6e73c79638da7c0f1d7e8681ed63999d77ae | |
| parent | 9e2fdf2af0af7fbdbb2a022f0a534cd937f64c3b (diff) | |
| download | php-git-27d2fe07ffab419e0d7a09b1191e356785f4253b.tar.gz | |
MF51:- Fixed bug #34850 (--program-suffix and --program-prefix not included in man page names)
| -rw-r--r-- | sapi/cli/Makefile.frag | 2 | ||||
| -rw-r--r-- | scripts/Makefile.frag | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sapi/cli/Makefile.frag b/sapi/cli/Makefile.frag index 5db4c68baf..6903ca1fc0 100644 --- a/sapi/cli/Makefile.frag +++ b/sapi/cli/Makefile.frag @@ -8,4 +8,4 @@ install-cli: $(SAPI_CLI_PATH) @$(INSTALL_CLI) @echo "Installing PHP CLI man page: $(INSTALL_ROOT)$(mandir)/man1/" @$(mkinstalldirs) $(INSTALL_ROOT)$(mandir)/man1 - @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/php.1 + @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)php$(program_suffix).1 diff --git a/scripts/Makefile.frag b/scripts/Makefile.frag index 93c48bec0b..61783d777d 100644 --- a/scripts/Makefile.frag +++ b/scripts/Makefile.frag @@ -22,7 +22,7 @@ BUILD_FILES_EXEC = \ config.sub bin_SCRIPTS = phpize php-config -man_PAGES = phpize.1 php-config.1 +man_PAGES = phpize php-config install-build: @echo "Installing build environment: $(INSTALL_ROOT)$(phpbuilddir)/" @@ -53,14 +53,14 @@ install-headers: 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); \ + echo " program: $(program_prefix)$${prog}$(program_suffix)"; \ + $(INSTALL) -m 755 $(builddir)/$${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 \ - echo " page: $$page"; \ - $(INSTALL_DATA) $(builddir)/man1/$$page $(INSTALL_ROOT)$(mandir)/man1/$$page; \ + echo " page: $(program_prefix)$${page}$(program_suffix).1"; \ + $(INSTALL_DATA) $(builddir)/man1/$${page}.1 $(INSTALL_ROOT)$(mandir)/man1/$(program_prefix)$${page}$(program_suffix).1; \ done $(builddir)/phpize: $(srcdir)/phpize.in $(top_builddir)/config.status |