From 9009890726580f532ea879227a8291c15ba945a3 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Sat, 6 Jan 2007 18:06:02 +0000 Subject: [PATCH] don't install the nanorc manpages if nano is built without nanorc support git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4020 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 +++ configure.ac | 1 + doc/man/Makefile.am | 8 +++++++- doc/man/fr/Makefile.am | 8 +++++++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4963b93b..5e921945 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ CVS code - - General: - Miscellaneous comment fixes. (DLR) + - Don't install the nanorc manpages if nano is built without + nanorc support. Changes to configure.ac, doc/man/Makefile.am, + and doc/man/fr/Makefile.am. (DLR) - winio.c: do_credits() - Update the last copyright notice to include 2006. (DLR) diff --git a/configure.ac b/configure.ac index 8e011417..4cb50836 100644 --- a/configure.ac +++ b/configure.ac @@ -372,6 +372,7 @@ int main(void) esac], [AC_MSG_RESULT(no)]) AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes) +AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes) dnl Checks for functions. diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index cf58ee2b..d76d8646 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -4,7 +4,13 @@ else SUBDIRS = endif +if USE_NANORC man_MANS = nano.1 nanorc.5 rnano.1 +else +man_MANS = nano.1 rnano.1 +endif + +nano_mans = nano.1 nanorc.5 rnano.1 BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html @@ -15,4 +21,4 @@ nanorc.5.html: nanorc.5 rnano.1.html: rnano.1 cat $< | groff -t -mandoc -Thtml > $@ -EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES) +EXTRA_DIST = $(nano_mans) $(BUILT_SOURCES) diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am index bde9bc25..5f295d8b 100644 --- a/doc/man/fr/Makefile.am +++ b/doc/man/fr/Makefile.am @@ -1,6 +1,12 @@ mandir = @mandir@/fr +if USE_NANORC man_MANS = nano.1 nanorc.5 rnano.1 +else +man_MANS = nano.1 rnano.1 +endif + +nano_mans = nano.1 nanorc.5 rnano.1 BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html @@ -11,4 +17,4 @@ nanorc.5.html: nanorc.5 rnano.1.html: rnano.1 cat $< | groff -t -mandoc -Thtml > $@ -EXTRA_DIST = $(man_MANS) $(BUILT_SOURCES) +EXTRA_DIST = $(nano_mans) $(BUILT_SOURCES)