[Wesnoth-cvs-commits] wesnoth Makefile.am configure.ac

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/01/20 00:24:49

Modified files:
        .              : Makefile.am configure.ac 

Log message:
        Added support for multilanguage man pages.
        Moved man page install/uninstall from top level to doc/man.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.am.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.108&tr2=1.109&r1=text&r2=text

Patches:
Index: wesnoth/Makefile.am
diff -u wesnoth/Makefile.am:1.21 wesnoth/Makefile.am:1.22
--- wesnoth/Makefile.am:1.21    Mon Dec 27 23:25:29 2004
+++ wesnoth/Makefile.am Thu Jan 20 00:24:49 2005
@@ -1,5 +1,5 @@
 ISUBDIRS = icons
-SUBDIRS = intl po m4 src $(ISUBDIRS)
+SUBDIRS = intl po m4 src doc $(ISUBDIRS)
 pkgdatadir=$(datadir)/@DATADIR@
 
 bin_SCRIPTS = utils/wmlxgettext
@@ -62,12 +62,9 @@
        ( $(finddata); $(findnoinst) ) | (cd $(top_srcdir) && tar cf - -T -) | 
(cd $(distdir) && tar xf -)
 
 dist_noinst_DATA = copyright changelog wesnoth.dsp wesnoth.dsw
-dist_man6_MANS = doc/man/wesnoth.6 doc/man/wesnothd.6 doc/man/wesnoth_editor.6
 
 uninstall-hook:
        if test -d $(pkgdatadir) ; then rm -r $(pkgdatadir) ; fi
-       if test -d $(mandir)/man6 ; then echo `rmdir $(mandir)/man6` ; fi
-       if test -d $(mandir); then echo `rmdir $(mandir)` ; fi
        if test -d $(bindir) ; then echo `rmdir $(bindir)` ; fi
        if test -d $(datadir) ; then echo `rmdir $(datadir)` ; fi
        if test -d $(prefix) ; then echo `rmdir $(prefix)` ; fi
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.108 wesnoth/configure.ac:1.109
--- wesnoth/configure.ac:1.108  Sat Jan  8 13:57:22 2005
+++ wesnoth/configure.ac        Thu Jan 20 00:24:49 2005
@@ -10,7 +10,7 @@
 dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default 
server for this version])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org:14999"], [The default 
server for this version])
 
-AC_REVISION([$Revision: 1.108 $])
+AC_REVISION([$Revision: 1.109 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -721,6 +721,8 @@
                 src/server/Makefile
                 src/campaign_server/Makefile
                 src/tools/Makefile
-                src/zip/Makefile])
+                src/zip/Makefile
+                doc/Makefile
+                doc/man/Makefile])
 
 AC_OUTPUT