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

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

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

Jason Short wrote:
> I think the AC_OUTPUT(civ) becomes AC_OUTPUT(civ:bootstrap/civ.in).

  Yes, thanks.

  I tried to test with autoconf-2.13 too and I'm quite convinced that 
this patch caused no problems for it. Because of problems not related to 
this patch I had to do some tricks to make test go through. In theory, 
it is possible that my tricks hide some problems from this patch too.


  - Caz

diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac        2004-09-05 12:02:58.765625000 +0300
+++ freeciv/configure.ac        2004-09-05 12:11:19.843750000 +0300
@@ -5,6 +5,7 @@
 AC_INIT
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR([common/game.c])
+AC_CONFIG_AUX_DIR([bootstrap])
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_TARGET
 
@@ -651,8 +652,8 @@
          doc/ja/Makefile
          doc/nl/Makefile
          doc/sv/Makefile
-         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 ]],[[]])
+         bootstrap/undep.sh])
+AC_CONFIG_FILES([civ:bootstrap/civ.in], [chmod +x civ])
+AC_CONFIG_FILES([ser:bootstrap/ser.in], [chmod +x ser])
+AC_CONFIG_COMMANDS([default],[[ chmod +x bootstrap/undep.sh ; 
bootstrap/undep.sh ]],[[]])
 AC_OUTPUT
diff -Nurd -X.diff_ignore freeciv/configure.in freeciv/configure.in
--- freeciv/configure.in        2004-09-05 12:02:58.781250000 +0300
+++ freeciv/configure.in        2004-09-05 12:12:33.281250000 +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(bootstrap)
 AM_CONFIG_HEADER(config.h)
 
 dnl May not be quite correct, but autoconf version 2.9 is reported 
@@ -648,7 +649,7 @@
          doc/ja/Makefile
          doc/nl/Makefile
          doc/sv/Makefile
-         civ
-         ser
-         undep.sh,
-         [ chmod +x undep.sh civ ser ; ./undep.sh ])
+         civ:bootstrap/civ.in
+         ser:bootstrap/ser.in
+         bootstrap/undep.sh,
+         [ chmod +x bootstrap/undep.sh civ ser ; bootstrap/undep.sh ])