summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-03-20 21:08:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:08 -0500
commitb62fae5edc6115b265660447d8833166fdd771fa (patch)
tree5e1222349360d0c3db188525fabff913e61066b4
parent0ca0cec504710d3c0f00826605408d80562d4672 (diff)
downloadsamba-b62fae5edc6115b265660447d8833166fdd771fa.tar.gz
samba-b62fae5edc6115b265660447d8833166fdd771fa.tar.bz2
samba-b62fae5edc6115b265660447d8833166fdd771fa.zip
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)
-rw-r--r--source3/Makefile.in6
-rw-r--r--source3/configure.in24
-rwxr-xr-xsource3/script/installman.sh2
3 files changed, 3 insertions, 29 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8f55449184..c0db16d479 100644
--- 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 b4cfa9a598..e1c9ea0614 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3629,30 +3629,6 @@ else
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?
INSTALLCLIENTCMD_SH=:
diff --git a/source3/script/installman.sh b/source3/script/installman.sh
index c7a8f45095..d30429d50a 100755
--- 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