Re: [Freeciv-Dev] freeciv/debian in dist?

[David Pfitzner <dwp@xxxxxxxxxxxxxx>]

I wrote:

> freeciv/debian doesn't add many kilobytes, but one minor hassle I thought 
> of is that the straightforward way of including it would mean that "make" 
> would Decend into the debian directory every time it is run in the top
> freeciv directory, even though there is nothing for it to do there. 
> (As currently happens with the data directory -- and I assume will happen 
> with data/units when the units.xpm is split up?)

I think I found a solution to the above particular problem; patch attached,
short answer: automake's DIST_SUBDIRS.  (I don't think we can use this for
freeciv/data because we want 'make install' to work there?  I'm not sure
how 'make install' works with data/units/...)

So given this, and Lalo's clarification/resolution of the changelog
issue, I think it's no real inconvenience to us to include the debian 
dir in the dist.  (I agree with Mitch that if there is a clash of
convenience, we concentrate on platform-independent freeciv first,
but I think the debian dir is now ok.)

Regarding other platforms wanting similar treatment, I agree with Per 
that we should include any such stuff, if is donated.  Providing it 
doesn't unduely inconvenience us, or become a maintenance problem
for us.  Then we can include sections in INSTALL, "if you want to
make such-and-such a package, just do blah".

(Re the man pages, my impression is that freeciv decided to stop 
maintaining them, but by policy debian wants some manpages so kept 
them.)

-- David

Disclaimer: I'm also a Debian user, but I don't actually use 
debianized freeciv, so this doesn't really affect me personally.

diff -N -u -r --exclude-from exclude freeciv-cvs/Makefile.am 
freeciv-mod/Makefile.am
--- freeciv-cvs/Makefile.am     Sun Nov 15 12:49:37 1998
+++ freeciv-mod/Makefile.am     Sat Nov 28 17:00:22 1998
@@ -14,6 +14,8 @@
 
 SUBDIRS=       data common $(SSUBDIRS) $(CSUBDIRS)
 
+DIST_SUBDIRS=  data common ai server client debian
+
 EXTRA_DIST=    AUTHORS COPYING ChangeLog HOWTOPLAY \
                INSTALL Imakefile Makefile.in Makefile.noimake \
                NEWS README README.AI \
diff -N -u -r --exclude-from exclude freeciv-cvs/configure.in 
freeciv-mod/configure.in
--- freeciv-cvs/configure.in    Sat Nov 21 19:02:48 1998
+++ freeciv-mod/configure.in    Sat Nov 28 16:54:38 1998
@@ -133,4 +133,4 @@
 AC_EXPAND_DIR(FREECIV_DATADIR, "$datadir/freeciv")
 AC_DEFINE_UNQUOTED(FREECIV_DATADIR, "$FREECIV_DATADIR")
 
-AC_OUTPUT(Makefile data/Makefile common/Makefile ai/Makefile client/Makefile 
server/Makefile)
+AC_OUTPUT(Makefile data/Makefile common/Makefile ai/Makefile client/Makefile 
server/Makefile debian/Makefile)
diff -N -u -r --exclude-from exclude freeciv-cvs/debian/Makefile.am 
freeciv-mod/debian/Makefile.am
--- freeciv-cvs/debian/Makefile.am      Thu Jan  1 10:00:00 1970
+++ freeciv-mod/debian/Makefile.am      Sat Nov 28 17:02:19 1998
@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = \
+       README.Debian \
+       changelog \
+       civ \
+       civ.man \
+       civclient.6 \
+       civserver.6 \
+       control \
+       copyright \
+       menu \
+       postinst \
+       postrm \
+       rules \
+       xaw-wrappers