[Freeciv-Dev] Re: (PR#9758) Directory structure cleanup
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
|
To: |
undisclosed-recipients: ; |
|
Subject: |
[Freeciv-Dev] Re: (PR#9758) Directory structure cleanup |
|
From: |
"Marko Lindqvist" <marko.lindqvist@xxxxxxxxxxx> |
|
Date: |
Sat, 18 Sep 2004 13:42:14 -0700 |
|
Reply-to: |
rt@xxxxxxxxxxx |
<URL: http://rt.freeciv.org/Ticket/Display.html?id=9758 >
Patch updated against CVS.
freeciv.spec.in moved to bootstrap too. Note that autoconf distributes
it automatically.
- Caz
diff -Nurd -X.diff_ignore freeciv/Makefile.am freeciv/Makefile.am
--- freeciv/Makefile.am 2004-09-18 13:29:22.687500000 +0300
+++ freeciv/Makefile.am 2004-09-18 23:44:01.296875000 +0300
@@ -91,8 +91,7 @@
vms/freeciv_h.vms \
vms/imlib_config.h_vms \
vms/readme.vms \
- vms/vms_build.com \
- freeciv.spec.in
+ vms/vms_build.com
noinst_HEADERS= version.in
diff -Nurd -X.diff_ignore freeciv/configure.ac freeciv/configure.ac
--- freeciv/configure.ac 2004-09-18 13:28:54.218750000 +0300
+++ freeciv/configure.ac 2004-09-18 23:43:41.359375000 +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
@@ -665,9 +666,9 @@
doc/ja/Makefile
doc/nl/Makefile
doc/sv/Makefile
- undep.sh
- freeciv.spec])
-AC_CONFIG_FILES([civ], [chmod +x civ])
-AC_CONFIG_FILES([ser], [chmod +x ser])
-AC_CONFIG_COMMANDS([default],[[ chmod +x undep.sh ; ./undep.sh ]],[[]])
+ freeciv.spec:bootstrap/freeciv.spec.in
+ 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-18 13:28:54.218750000 +0300
+++ freeciv/configure.in 2004-09-18 23:43:41.359375000 +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
@@ -660,8 +661,8 @@
doc/ja/Makefile
doc/nl/Makefile
doc/sv/Makefile
- civ
- ser
- undep.sh
- freeciv.spec,
- [ chmod +x undep.sh civ ser ; ./undep.sh ])
+ civ:bootstrap/civ.in
+ ser:bootstrap/ser.in
+ freeciv.spec:bootstrap/freeciv.spec.in
+ bootstrap/undep.sh,
+ [ chmod +x bootstrap/undep.sh civ ser ; bootstrap/undep.sh ])
|
|
