diff options
| author | Daiki Ueno <ueno@gnu.org> | 2014-04-22 11:19:38 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2014-04-22 14:50:28 +0900 |
| commit | fbf4e276c81d85c56fded43306fe025db8722597 (patch) | |
| tree | ccd86af1da751747d63cf9c0a8de874661ade194 /gettext-runtime/man | |
| parent | 1431ba78ad26de5e9826e14586c6be0fde314ca9 (diff) | |
| download | external_gettext-fbf4e276c81d85c56fded43306fe025db8722597.zip external_gettext-fbf4e276c81d85c56fded43306fe025db8722597.tar.gz external_gettext-fbf4e276c81d85c56fded43306fe025db8722597.tar.bz2 | |
build: Use git-version-gen intead of version.sh
* version.sh: Remove.
* autogen.sh: Import git-version-gen from Gnulib.
* Makefile.am (EXTRA_DIST): Add $(top_srcdir)/.version.
(BUILT_SOURCES): Likewise.
($(top_srcdir)/.version): New rule.
(dist-hook): New rule.
* configure.ac: Use git-version-gen in AC_INIT.
* gettext-runtime/configure.ac: Likewise.
* gettext-tools/configure.ac: Likewise.
* gettext-tools/examples/configure.ac: Likewise.
* gettext-runtime/man/Makefile.am: Refer to .version instead of
version.sh.
* gettext-tools/doc/Makefile.am: Likewise.
* gettext-tools/man/Makefile.am: Likewise.
Diffstat (limited to 'gettext-runtime/man')
| -rw-r--r-- | gettext-runtime/man/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/man/Makefile.am | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/gettext-runtime/man/ChangeLog b/gettext-runtime/man/ChangeLog index 0339a98..5f3e836 100644 --- a/gettext-runtime/man/ChangeLog +++ b/gettext-runtime/man/ChangeLog @@ -1,3 +1,8 @@ +2014-04-22 Daiki Ueno <ueno@gnu.org> + + build: Use git-version-gen intead of version.sh + * Makefile.am: Refer to .version instead of version.sh. + 2013-06-10 Daiki Ueno <ueno@gnu.org> * Makefile.am: Use $(MKDIR_P) instead of $(mkdir_p). diff --git a/gettext-runtime/man/Makefile.am b/gettext-runtime/man/Makefile.am index 4c62007..46e0199 100644 --- a/gettext-runtime/man/Makefile.am +++ b/gettext-runtime/man/Makefile.am @@ -92,11 +92,10 @@ ngettext.1.in: ngettext.x envsubst.1: envsubst.x $(SHELL) x-to-1 $(UPDATEMODE) "$(PERL)" "$(HELP2MAN)" ../src/envsubst$(EXEEXT) $(srcdir)/envsubst.x envsubst.1 -# Depend on version.sh to get version number changes. -$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../version.sh +$(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../.version # Update them also during "make dist", in order to propagate added command -# line options that were added, even if version.sh didn't change. +# line options that were added, even if .version didn't change. UPDATEMODE = update-man1: $(MAKE) $(man_MAN1IN) $(man_MAN1OTHER) UPDATEMODE=--update @@ -104,19 +103,19 @@ update-man1: # Hidden from automake, but really activated. Works around an automake-1.5 bug. #distdir: update-man1 -gettext.3: gettext.3.in $(top_srcdir)/../version.sh +gettext.3: gettext.3.in $(top_srcdir)/../.version sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/gettext.3.in > t-$@ mv t-$@ $@ -ngettext.3: ngettext.3.in $(top_srcdir)/../version.sh +ngettext.3: ngettext.3.in $(top_srcdir)/../.version sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/ngettext.3.in > t-$@ mv t-$@ $@ -textdomain.3: textdomain.3.in $(top_srcdir)/../version.sh +textdomain.3: textdomain.3.in $(top_srcdir)/../.version sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/textdomain.3.in > t-$@ mv t-$@ $@ -bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../version.sh +bindtextdomain.3: bindtextdomain.3.in $(top_srcdir)/../.version sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bindtextdomain.3.in > t-$@ mv t-$@ $@ -bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../version.sh +bind_textdomain_codeset.3: bind_textdomain_codeset.3.in $(top_srcdir)/../.version sed -e 's/@''VERSION''@/@VERSION@/g' < $(srcdir)/bind_textdomain_codeset.3.in > t-$@ mv t-$@ $@ |