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

diff --git a/ChangeLog b/ChangeLog
index 4963b93bbb50fe1e132ff517d5f7096a6800083a..5e921945c98af93c0343c386cae7011f07e7b1ae 100644 (file)
--- 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 8e011417a7ae2104e65088db3d2d788400d0a383..4cb50836c505085b85c678f4e2f08b7d639d708c 100644 (file)
--- 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 cf58ee2b0cc846546fb6041ea94ebcdc160b6aa5..d76d86466574e7a83a3ddefe1eb14f50f0c905bd 100644 (file)
--- 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 bde9bc2528aa62d4b1b4c0981f3dd63e474969f8..5f295d8bf4ac63e5dea54b3c936d84ddbde07f99 100644 (file)
--- 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)