per Mike Frysinger's patch, don't install the localized versions of the

manpages if nano is built with --disable-nls

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3175 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 4bc4e7e495685eaa14e0e638a292326e974ef10d..c79f94119fe67e17f207566b4c0cc3974737074b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,9 @@ CVS code -
          completion functions adapted from busybox.  Also, invoke LGPL
          clause 3 to convert all LGPLed functions to GPLed ones, so
          that we don't have to include a copy of the LGPL. (DLR)
+       - Don't install the localized versions of the manpages if
+         nano is built with --disable-nls.  Changes to Makefile.am and
+         doc/man/Makefile.am. (Mike Frysinger)
 - chars.c:
   mbwidth()
        - If wcwidth() returns -1 for the character passed in, treat the

diff --git a/configure.ac b/configure.ac
index f3673c4febe6c988799561a4ed0744fc9fc1f31f..d34c83b0b04f59f554557097d6bebf73141e184f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -39,6 +39,7 @@ dnl Internationalization macros.
 
 AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT([external], [need-ngettext])
+AM_CONDITIONAL(USE_NLS, test "x$USE_NLS" = "xyes")
 
 dnl Checks for header files.
 

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index a37ed2ff837752e1ed725ce538eb943fcf62f8b2..f6a2df86679ce7ec551cd7fb4acf27b30ba3f886 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,8 @@
+if USE_NLS
 SUBDIRS = fr
+else
+SUBDIRS =
+endif
 
 man_MANS = nano.1 nanorc.5