r5915: Remove --with-manpages-languages= from configure (we only have them in one

lanuage, English, at the moment). Fixes #2261. If other languages
might are added in the future, this parameter will still not be needed.
(This used to be commit d41e790b4ba96b42ae80f51925a86a3344d3fd39)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8f55449184bbe350536e5da83eaa7032cfe3ed11..c0db16d479c67f053399f6e93d98afdc42eba1a7 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -92,8 +92,6 @@ LOCKDIR = @lockdir@
 
 # the directory where pid files go
 PIDDIR = @piddir@
-# man pages language(s)
-man_langs = "@manlangs@"
 
 LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
 LIBSMBCLIENT_MAJOR=0
@@ -1375,7 +1373,7 @@ revert:
        @$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
 
 installman: installdirs
-       @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) $(man_langs) "@ROFF@"
+       @$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C "@ROFF@"
 
 .PHONY: showlayout
 
@@ -1397,7 +1395,7 @@ showlayout:
 uninstall: uninstallman uninstallbin uninstallscripts uninstallmodules
 
 uninstallman:
-       @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) $(man_langs)
+       @$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C
 
 uninstallbin:
        @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(SBIN_PROGS)

diff --git a/source3/configure.in b/source3/configure.in
index b4cfa9a5984cb9c21ab58d3cf170f0e386a31da6..e1c9ea0614e007cb132f8d0cc091df38446bed67 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3628,30 +3628,6 @@ else
         AC_MSG_RESULT(no$utmp_no_reason)
 fi
 
-#################################################
-# choose native language(s) of man pages
-AC_MSG_CHECKING(chosen man pages' language(s))
-AC_ARG_WITH(manpages-langs,
-[  --with-manpages-langs={en,ja,pl}  Choose man pages' language(s). (en)],
-[ case "$withval" in
-  yes|no)
-    AC_MSG_WARN(--with-manpages-langs called without argument - will use default)
-    manlangs="en"
-  ;;
-  *)
-    manlangs="$withval"
-  ;;
-  esac
-
-  AC_MSG_RESULT($manlangs)
-  manlangs=`echo $manlangs | sed "s/,/ /g"`   # replacing commas with spaces to produce a list
-  AC_SUBST(manlangs)],
-
-  [manlangs="en"
-  AC_MSG_RESULT($manlangs)
-  AC_SUBST(manlangs)]
-)
-
 #################################################
 # should we build libsmbclient?
 

diff --git a/source3/script/installman.sh b/source3/script/installman.sh
index c7a8f45095144cc3b04e6a0f4fde543b45464ea4..d30429d50a0800bc9893fa571a35e1108ba51a2e 100755 (executable)
--- a/source3/script/installman.sh
+++ b/source3/script/installman.sh
@@ -15,7 +15,7 @@ fi
 
 
 for lang in $langs; do
-    if [ "X$lang" = Xen ]; then
+    if [ "X$lang" = XC ]; then
        echo Installing default man pages in $MANDIR/
        lang=.
     else