diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 23:22:12 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2011-10-25 23:22:12 +0000 |
| commit | 5cdb7e63b5262d2a30d11916242fb6c33746d350 (patch) | |
| tree | f94cdf70607b93c8e3b5a64bd80b506530c8eca1 /libc | |
| parent | c86ab84d63b20aff7cf391414009a38477fe7137 (diff) | |
2011-10-25 Michael Hope <michael.hope@linaro.org>
* 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.
git-svn-id: svn://svn.eglibc.org/trunk@15560 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/ChangeLog.eglibc | 8 | ||||
| -rw-r--r-- | libc/aclocal.m4 | 2 | ||||
| -rw-r--r-- | libc/config.make.in | 2 | ||||
| -rwxr-xr-x | libc/configure | 3 | ||||
| -rw-r--r-- | libc/manual/Makefile | 5 |
5 files changed, 17 insertions, 3 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index 4d91c833a..c09d24f3d 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,11 @@ +2011-10-25 Michael Hope <michael.hope@linaro.org> + + * 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@linaro.org> * manual/Makefile (stamp-pkgvers): Escape PKGVERSION. Fix the diff --git a/libc/aclocal.m4 b/libc/aclocal.m4 index 18ce1b3ed..86c07f7d6 100644 --- a/libc/aclocal.m4 +++ b/libc/aclocal.m4 @@ -131,7 +131,9 @@ AC_DEFUN([ACX_PKGVERSION],[ esac], PKGVERSION="($1) " ) + PKGVERSION_TEXI=`echo "$PKGVERSION" | sed 's/@/@@/g'` AC_SUBST(PKGVERSION) + AC_SUBST(PKGVERSION_TEXI) ]) dnl Support the --with-bugurl configure option. diff --git a/libc/config.make.in b/libc/config.make.in index 2c3bbe82d..53453953c 100644 --- a/libc/config.make.in +++ b/libc/config.make.in @@ -140,6 +140,8 @@ LIBGD = @LIBGD@ # 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. diff --git a/libc/configure b/libc/configure index fdbb52386..bb689bbce 100755 --- a/libc/configure +++ b/libc/configure @@ -733,6 +733,7 @@ add_ons libc_cv_nss_crypt REPORT_BUGS_TEXI REPORT_BUGS_TO +PKGVERSION_TEXI PKGVERSION all_warnings force_install @@ -3791,6 +3792,8 @@ else fi + PKGVERSION_TEXI=`echo "$PKGVERSION" | sed 's/@/@@/g'` + diff --git a/libc/manual/Makefile b/libc/manual/Makefile index 7187ab9ff..c3724fcc5 100644 --- a/libc/manual/Makefile +++ b/libc/manual/Makefile @@ -116,9 +116,8 @@ stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\ # 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 $@ |