"Generate" the man page so that it gets correct version always.

diff --git a/sapi/cli/Makefile.frag b/sapi/cli/Makefile.frag
index 4c97ebe9149e9edf67a22ea4bf5e97b13e2cc8b5..df6c86f2f2e7dda253f69b08a09d8d5dcb04f61d 100644 (file)
--- a/sapi/cli/Makefile.frag
+++ b/sapi/cli/Makefile.frag
@@ -6,4 +6,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) $(srcdir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/php.1
+       @$(INSTALL_DATA) $(builddir)/php.1 $(INSTALL_ROOT)$(mandir)/man1/php.1

diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 439a636556b2b90ba823122c84df012e7b56980c..7651e702b3c0a9faa4bd1e10d362d2c52ac0450e 100644 (file)
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -31,8 +31,10 @@ if test "$PHP_SAPI_CLI" != "no"; then
     ;;
   esac
   INSTALL_CLI="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(bindir); \$(INSTALL) -m 0755 \$(SAPI_CLI_PATH) \$(INSTALL_ROOT)\$(bindir)/php"
+
   PHP_SUBST(BUILD_CLI)
   PHP_SUBST(INSTALL_CLI)
+  PHP_OUTPUT(sapi/cli/php.1)
 fi
 
 AC_MSG_RESULT($PHP_SAPI_CLI)

diff --git a/sapi/cli/php.1 b/sapi/cli/php.1.in
similarity index 99%
rename from sapi/cli/php.1
rename to sapi/cli/php.1.in
index 6235c394b1b9993d48a6d9c37d3d669e56f5f819..75fc6f5fe2f6a3b0eafef9ef70d6d9e2671590da 100644 (file)
--- a/sapi/cli/php.1
+++ b/sapi/cli/php.1.in
@@ -281,7 +281,7 @@ A List of active developers can be found here:
 And last but not least PHP was developed with the help of a huge amount of 
 contributors all around the world.
 .SH VERSION INFORMATION
-This manpage describes \fBphp\fP, version 5.0.0.
+This manpage describes \fBphp\fP, version @PHP_VERSION@.
 .SH COPYRIGHT
 Copyright \(co 1997\-2003 The PHP Group
 .LP