From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH] docs: do not overwrite ddate.1 manual
Date: Sun, 26 Feb 2012 22:45:40 +0100 [thread overview]
Message-ID: <1330292740-7737-1-git-send-email-kerolasa@iki.fi> (raw)
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>
---
configure.ac | 2 ++
man/ru/Makefile.am | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index d3b298c..be9da27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -833,6 +833,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 31fafb9..64e88fd 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
--
1.7.9.2
next reply other threads:[~2012-02-26 21:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-26 21:45 Sami Kerola [this message]
2012-02-28 17:18 ` [PATCH] docs: do not overwrite ddate.1 manual Karel Zak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1330292740-7737-1-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox