[Freeciv-Dev] [Fwd: Re: Re: (PR#9758) Directory structure cleanup]

["Marko Lindqvist" <marko.lindqvist@xxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=9758 >



-------- Original Message --------
Subject: Re: [Freeciv-Dev] Re: (PR#9758) Directory structure cleanup
Date: Sun, 22 Aug 2004 13:10:11 +0300
From: Marko Lindqvist <marko.lindqvist@xxxxxxxxxxx>
To: rt@xxxxxxxxxxx
References: <x41276733.1010609@xxxxxxxxxxxx>

> Marko Lindqvist wrote:
>>We could also clean freeciv root 
>>directory from configure tools (AC_CONFIG_AUX_DIR)

   Atatched patch makes configure to search auxiliary files from
directory 'misc'. Directory for configure tools is usually named as
'config', but that would be misleading name if we are later going to put
some more files there.

   In addition to applying patch, you should:

   mkdir misc
   mv config.guess config.sub install-sh missing mkinstalldirs
undep.sh.in misc/


   Someone should test this with older autoconf before it can go in.


Jason Short wrote:
> What would be the new directory and what files would go in it?

   I used name 'misc' for this patch, but that's trivial to change if you
come up with better one. In addition to files moved by this patch, we
may later want to move following files (new files, for example from
#9494, should go directly to new directory)

   - civ.in & ser.in
   - config.mac.h (?, Not if move would be inconvenient for users)
   - diff_ignore (then again, we do want occasional patch writers to
easily find it)
   - #4712: IMHO version.in should stay in root directory, even when new
buildnbr.in (or something like that) goes in misc.



   - Caz




diff -Nurd freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac        2004-08-18 17:11:33.421875000 +0300
+++ freeciv/configure.ac        2004-08-22 11:42:54.593750000 +0300
@@ -5,6 +5,7 @@
 AC_INIT
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([common/game.c])
+AC_CONFIG_AUX_DIR([misc])
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_TARGET
 
@@ -654,8 +655,8 @@
          doc/ja/Makefile
          doc/nl/Makefile
          doc/sv/Makefile
-         undep.sh])
+         misc/undep.sh])
 AC_CONFIG_FILES([civ], [chmod +x civ])
 AC_CONFIG_FILES([ser], [chmod +x ser])
-AC_CONFIG_COMMANDS([default],[[ chmod +x undep.sh ; ./undep.sh ]],[[]])
+AC_CONFIG_COMMANDS([default],[[ chmod +x misc/undep.sh ; misc/undep.sh ]],[[]])
 AC_OUTPUT
diff -Nurd freeciv/configure.in freeciv/configure.in
--- freeciv/configure.in        2004-08-18 17:11:33.437500000 +0300
+++ freeciv/configure.in        2004-08-22 11:42:51.859375000 +0300
@@ -3,6 +3,7 @@
 
 dnl Initialize with some random file to ensure the source is here.
 AC_INIT(common/game.c)
+AC_CONFIG_AUX_DIR(misc)
 AM_CONFIG_HEADER(config.h)
 
 dnl May not be quite correct, but autoconf version 2.9 is reported 
@@ -651,5 +652,5 @@
          doc/sv/Makefile
          civ
          ser
-         undep.sh,
-         [ chmod +x undep.sh civ ser ; ./undep.sh ])
+         misc/undep.sh,
+         [ chmod +x misc/undep.sh civ ser ; misc/undep.sh ])