[Commits] r15560 - in /trunk/libc: ChangeLog.eglibc aclocal.m4 config.make.in configure manual/Makefile

[joseph@xxxxxxxxxx]

Author: joseph
Date: Tue Oct 25 23:22:12 2011
New Revision: 15560

Log:
2011-10-25  Michael Hope  <michael.hope@xxxxxxxxxx>

	* aclocal.m4 (PKGVERSION_TEXI): Define.
	* config.make.in (PKGVERSION_TEXI, REPORT_BUGS_TEXI): Define.
	* manual/Makefile (stamp-pkgvers): Use PKGVERSION_TEXI and
	REPORT_BUGS_TEXI.
	* configure: Regenerate.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/aclocal.m4
    trunk/libc/config.make.in
    trunk/libc/configure
    trunk/libc/manual/Makefile

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Tue Oct 25 23:22:12 2011
@@ -1,3 +1,11 @@
+2011-10-25  Michael Hope  <michael.hope@xxxxxxxxxx>
+
+	* aclocal.m4 (PKGVERSION_TEXI): Define.
+	* config.make.in (PKGVERSION_TEXI, REPORT_BUGS_TEXI): Define.
+	* manual/Makefile (stamp-pkgvers): Use PKGVERSION_TEXI and
+	REPORT_BUGS_TEXI.
+	* configure: Regenerate.
+
 2011-10-07  Michael Hope  <michael.hope@xxxxxxxxxx>
 
 	* manual/Makefile (stamp-pkgvers): Escape PKGVERSION.  Fix the

Modified: trunk/libc/aclocal.m4
==============================================================================
--- trunk/libc/aclocal.m4 (original)
+++ trunk/libc/aclocal.m4 Tue Oct 25 23:22:12 2011
@@ -131,7 +131,9 @@
      esac],
     PKGVERSION="($1) "
   )
+  PKGVERSION_TEXI=`echo "$PKGVERSION" | sed 's/@/@@/g'`
   AC_SUBST(PKGVERSION)
+  AC_SUBST(PKGVERSION_TEXI)
 ])
 
 dnl Support the --with-bugurl configure option.

Modified: trunk/libc/config.make.in
==============================================================================
--- trunk/libc/config.make.in (original)
+++ trunk/libc/config.make.in Tue Oct 25 23:22:12 2011
@@ -140,6 +140,8 @@
 
 # Package versions and bug reporting configuration.
 PKGVERSION = @PKGVERSION@
+PKGVERSION_TEXI = @PKGVERSION_TEXI@
 REPORT_BUGS_TO = @REPORT_BUGS_TO@
+REPORT_BUGS_TEXI = @REPORT_BUGS_TEXI@
 
 # More variables may be inserted below by configure.

Modified: trunk/libc/configure
==============================================================================
--- trunk/libc/configure (original)
+++ trunk/libc/configure Tue Oct 25 23:22:12 2011
@@ -733,6 +733,7 @@
 libc_cv_nss_crypt
 REPORT_BUGS_TEXI
 REPORT_BUGS_TO
+PKGVERSION_TEXI
 PKGVERSION
 all_warnings
 force_install
@@ -3791,6 +3792,8 @@
 
 fi
 
+  PKGVERSION_TEXI=`echo "$PKGVERSION" | sed 's/@/@@/g'`
+
 
 
 

Modified: trunk/libc/manual/Makefile
==============================================================================
--- trunk/libc/manual/Makefile (original)
+++ trunk/libc/manual/Makefile Tue Oct 25 23:22:12 2011
@@ -116,9 +116,8 @@
 # Package version and bug reporting URL.
 pkgvers.texi: stamp-pkgvers
 stamp-pkgvers:
-	echo "@set PKGVERSION $(subst @,@@,$(PKGVERSION))" > pkgvers-tmp
-	echo "@set REPORT_BUGS_TO $(subst @,@@,$(REPORT_BUGS_TO))" \
-	  >> pkgvers-tmp
+	echo "@set PKGVERSION $(PKGVERSION_TEXI)" > pkgvers-tmp
+	echo "@set REPORT_BUGS_TO $(REPORT_BUGS_TEXI)" >> pkgvers-tmp
 	$(move-if-change) pkgvers-tmp pkgvers.texi
 	touch $@
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits