[Freeciv-Dev] (PR#39808) Use $sysconfdir in relevant Makefiles.
http://bugs.freeciv.org/Ticket/Display.html?id=39808 >
> [jordi - Mon Oct 29 11:17:56 2007]:
>
> data/Makefile.am installs GGZ stuff in the wrong place.
>
> Attached patch should fix it.
>
Actually it should be installed in $ggzdconfdir which is provided by
AC_GGZ_SERVER (which isn't, but should be, called in configure).
Strangely though $ggzdconfdir defaults to $prefix/etc instead of to
$sysconfdir. Trying to get an explanation of that one from josef.
This patch does the initial fixes however (the ggz.m4 changes parallel
fixes already made in ggz).
-jason
Index: m4/ggz.m4
===
--- m4/ggz.m4 (revision 14077)
+++ m4/ggz.m4 (working copy)
@@ -999,6 +999,7 @@
AC_GGZ_GGZDMOD([ggz_server="yes"], [ggz_server="no"])
fi
if test "$ggz_server" = "yes"; then
+ AC_GGZ_SERVER
AC_DEFINE(GGZ_SERVER, 1, [Server support for GGZ])
else
if test "$try_ggz_server" = "yes"; then
Index: data/Makefile.am
===
--- data/Makefile.am (revision 14077)
+++ data/Makefile.am (working copy)
@@ -85,8 +85,8 @@
if GGZ_SERVER
ggzroom_DATA = civserver.room
-ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ggzroomdir = ${ggzdconfdir}/rooms/
ggzgame_DATA = civserver.dsc
-ggzgamedir = ${prefix}/etc/ggzd/games/
+ggzgamedir = ${ggzdconfdir}/games/
endif
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39808) Use $sysconfdir in relevant Makefiles.
http://bugs.freeciv.org/Ticket/Display.html?id=39808 >
data/Makefile.am installs GGZ stuff in the wrong place.
Attached patch should fix it.
--- freeciv-2.1.0.orig/data/Makefile.am
+++ freeciv-2.1.0/data/Makefile.am
@@ -85,8 +85,8 @@
if GGZ_SERVER
ggzroom_DATA = civserver.room
-ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ggzroomdir = ${sysconfdir}/ggzd/rooms/
ggzgame_DATA = civserver.dsc
-ggzgamedir = ${prefix}/etc/ggzd/games/
+ggzgamedir = ${sysconfdir}/ggzd/games/
endif
--- freeciv-2.1.0.orig/data/Makefile.in
+++ freeciv-2.1.0/data/Makefile.in
@@ -253,10 +253,10 @@
SUBDIRS = icons $(CLIENTDATADIRS) $(SERVERDATADIRS)
@[EMAIL PROTECTED] = civserver.room
[EMAIL PROTECTED]@ggzroomdir = ${prefix}/etc/ggzd/rooms/
[EMAIL PROTECTED]@ggzroomdir = ${sysconfdir}/ggzd/rooms/
@[EMAIL PROTECTED] = civserver.dsc
[EMAIL PROTECTED]@ggzgamedir = ${prefix}/etc/ggzd/games/
[EMAIL PROTECTED]@ggzgamedir = ${sysconfdir}/ggzd/games/
subdir = data
mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
