svn commit: samba r5914 - in trunk/source: . script

[jelmer at samba.org]

Author: jelmer
Date: 2005-03-20 21:06:51 +0000 (Sun, 20 Mar 2005)
New Revision: 5914

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5914

Log:
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.

Modified:
   trunk/source/Makefile.in
   trunk/source/configure.in
   trunk/source/script/installman.sh


Changeset:
Modified: trunk/source/Makefile.in
===================================================================
--- trunk/source/Makefile.in	2005-03-20 18:02:37 UTC (rev 5913)
+++ trunk/source/Makefile.in	2005-03-20 21:06:51 UTC (rev 5914)
@@ -95,8 +95,6 @@
 
 # the directory where pid files go
 PIDDIR = @piddir@
-# man pages language(s)
-man_langs = "@manlangs@"
 
 LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
 LIBSMBCLIENT_MAJOR=0
@@ -1417,7 +1415,7 @@
 	@$(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
 
@@ -1439,7 +1437,7 @@
 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)

Modified: trunk/source/configure.in
===================================================================
--- trunk/source/configure.in	2005-03-20 18:02:37 UTC (rev 5913)
+++ trunk/source/configure.in	2005-03-20 21:06:51 UTC (rev 5914)
@@ -3634,30 +3634,6 @@
 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=:

Modified: trunk/source/script/installman.sh
===================================================================
--- trunk/source/script/installman.sh	2005-03-20 18:02:37 UTC (rev 5913)
+++ trunk/source/script/installman.sh	2005-03-20 21:06:51 UTC (rev 5914)
@@ -15,7 +15,7 @@
 
 
 for lang in $langs; do
-    if [ "X$lang" = Xen ]; then
+    if [ "X$lang" = XC ]; then
 	echo Installing default man pages in $MANDIR/
 	lang=.
     else