diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-11-06 03:13:37 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-11-06 03:13:37 +0100 |
| commit | 5c21e10c01d49baec611694882d30b97fba8b5b1 (patch) | |
| tree | f5d5b2b123482f73ca7791226e5e3534498e0a97 | |
| parent | e77a888e4aa7d113c0a7beca52d36701ae429eac (diff) | |
| download | ndim-git-utils-5c21e10c01d49baec611694882d30b97fba8b5b1.tar.gz ndim-git-utils-5c21e10c01d49baec611694882d30b97fba8b5b1.tar.xz ndim-git-utils-5c21e10c01d49baec611694882d30b97fba8b5b1.zip | |
Rename man page file to git-amb.man
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | git-amb/Makefile-files | 4 | ||||
| -rw-r--r-- | git-amb/git-amb.man.in (renamed from git-amb/git-amb.1.in) | 0 | ||||
| -rw-r--r-- | m4/ndim_detect_man2txt.m4 | 23 |
5 files changed, 28 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index e028901..84338a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ CLEANFILES = BUILT_SOURCES = EXTRA_DIST = bin_SCRIPTS = -man_MANS = +man1_MANS = UPLOAD_FILES = doc_DATA = dist_doc_DATA = @@ -14,8 +14,8 @@ include doc/Makefile-files include git-amb/Makefile-files if HAVE_NDIM_MAN2TXT -.1.txt: - set -x; $(NDIM_MAN2TXT) "$<" > "$@.new" +.man.txt: + $(NDIM_MAN2TXT) "$<" > "$@.new" test -s "$@.new" mv -f "$@.new" "$@" endif diff --git a/configure.ac b/configure.ac index 83f0a9f..70ad339 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_INIT([ndims git utilities], [1.6.3], [hun@n-dimensional.de], [ndim-git-utils]) -AC_CONFIG_SRCDIR([git-amb/git-amb.1.in]) +AC_CONFIG_SRCDIR([git-amb/git-amb.in]) AC_CONFIG_AUX_DIR([auto-aux]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([-Wall foreign 1.10 dist-bzip2 readme-alpha std-options]) @@ -12,6 +12,6 @@ m4_pattern_forbid([NDIM_DETECT_MAN2TXT])dnl NDIM_DETECT_MAN2TXT()dnl AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([git-amb/git-amb.1]) +AC_CONFIG_FILES([git-amb/git-amb.man]) AC_CONFIG_FILES([git-amb/git-amb]) AC_OUTPUT diff --git a/git-amb/Makefile-files b/git-amb/Makefile-files index 2aa4aeb..3af3afb 100644 --- a/git-amb/Makefile-files +++ b/git-amb/Makefile-files @@ -3,8 +3,8 @@ bin_SCRIPTS += git-amb/git-amb EXTRA_DIST += git-amb/git-amb.in UPLOAD_FILES += git-amb/git-amb -man_MANS += git-amb/git-amb.1 -EXTRA_DIST += git-amb/git-amb.1.in +man1_MANS += git-amb/git-amb.man +EXTRA_DIST += git-amb/git-amb.man.in if HAVE_NDIM_MAN2TXT dist_doc_DATA += git-amb/git-amb.txt diff --git a/git-amb/git-amb.1.in b/git-amb/git-amb.man.in index 8a15952..8a15952 100644 --- a/git-amb/git-amb.1.in +++ b/git-amb/git-amb.man.in diff --git a/m4/ndim_detect_man2txt.m4 b/m4/ndim_detect_man2txt.m4 index ad08d74..96986d1 100644 --- a/m4/ndim_detect_man2txt.m4 +++ b/m4/ndim_detect_man2txt.m4 @@ -1,4 +1,21 @@ -# serial 1.1 +# serial 1.6.3 +dnl +dnl NDIM_DETECT_MAN2TXT +dnl +dnl Syntax: +dnl +dnl configure.ac: +dnl NDIM_DETECT_MAN2TXT()dnl +dnl +dnl Makefile.am: +dnl if HAVE_NDIM_MAN2TXT +dnl .txt.man: +dnl $(NDIM_MAN2TXT) $< > $@ +dnl endif +dnl +dnl Define AM_CONDITIONAL HAVE_NDIM_MAN2TXT. +dnl If that is true, define NDIM_MAN2TXT. +dnl m4_pattern_forbid([NDIM_DETECT_MAN2TXT])dnl AC_DEFUN([NDIM_DETECT_MAN2TXT], [dnl AC_ARG_VAR([MAN]) @@ -12,10 +29,12 @@ AM_CONDITIONAL([HAVE_NDIM_MAN2TXT], AC_MSG_CHECKING([man and col -b work correctly]) if test "x$HAVE_NDIM_MAN2TXT_FALSE" = "x#"; then AC_MSG_RESULT([yes]) - AC_SUBST([NDIM_MAN2TXT], ['m2t(){ $(MAN) "$$(dirname "$$][1")/$$(basename "$$][1")"|$(COL) -b; }; m2t'])dnl + NDIM_MAN2TXT='m2t(){ $(MAN) "$$(dirname "[$$]1")/$$(basename "[$$]1")"|$(COL) -b; }; m2t' else AC_MSG_RESULT([no $(echo "ABXY" | $COL -b)]) + NDIM_MAN2TXT='false' fi +AC_SUBST([NDIM_MAN2TXT]) ])dnl dnl dnl Local Variables: |