summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Kerola2012-02-26 22:45:40 +0100
committerKarel Zak2012-02-28 15:41:32 +0100
commit7aa8bdb50e49d18ad07d708a9ccfbf0ffbfaf612 (patch)
treeb917b3e1d19300c3f0cce439becacc86b2cd5de5
parentmount: (new) add 'internal-only(i)' to non-root allowed options (diff)
downloadkernel-qcow2-util-linux-7aa8bdb50e49d18ad07d708a9ccfbf0ffbfaf612.tar.gz
kernel-qcow2-util-linux-7aa8bdb50e49d18ad07d708a9ccfbf0ffbfaf612.tar.xz
kernel-qcow2-util-linux-7aa8bdb50e49d18ad07d708a9ccfbf0ffbfaf612.zip
docs: do not overwrite ddate.1 manual
The following warning meant either english manual page overwrote ru version, or otherway around. Neither way that not intented. This patch will change ru version of the manual page to be installed to <prefix><mandir>/ru/man1 directory. man/ru/Makefile.am:4: warning: mandir was already defined in condition TRUE, which includes condition BUILD_DDATE ... configure.ac:1: ... `mandir' previously defined here Signed-off-by: Sami Kerola <kerolasa@iki.fi>
-rw-r--r--configure.ac2
-rw-r--r--man/ru/Makefile.am5
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 966e9da94..8b8006ecd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -831,6 +831,8 @@ AC_ARG_ENABLE([ddate],
)
UL_BUILD_INIT([ddate])
AM_CONDITIONAL(BUILD_DDATE, test "x$build_ddate" = xyes)
+rumandir='${mandir}/ru/man1'
+AC_SUBST([rumandir])
AC_ARG_ENABLE([agetty],
diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am
index 31fafb9dd..64e88fdde 100644
--- a/man/ru/Makefile.am
+++ b/man/ru/Makefile.am
@@ -1,7 +1,6 @@
include $(top_srcdir)/config/include-Makefile.am
if BUILD_DDATE
-mandir = @mandir@/ru
-dist_man_MANS =
-dist_man_MANS += ddate.1
+ruman_DATA = ddate.1
+EXTRA_DIST = $(ruman_DATA)
endif