From: Jelmer Vernooij Date: Sun, 20 Mar 2005 21:08:50 +0000 (+0000) Subject: r5915: Remove --with-manpages-languages= from configure (we only have them in one X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5091 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d41e790b4ba96b42ae80f51925a86a3344d3fd39;p=thirdparty%2Fsamba.git 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. --- diff --git a/source/Makefile.in b/source/Makefile.in index 8f55449184b..c0db16d479c 100644 --- a/source/Makefile.in +++ b/source/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/source/configure.in b/source/configure.in index b4cfa9a5984..e1c9ea0614e 100644 --- a/source/configure.in +++ b/source/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/source/script/installman.sh b/source/script/installman.sh index c7a8f450951..d30429d50a0 100755 --- a/source/script/installman.sh +++ b/source/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