[Wesnoth-cvs-commits] wesnoth ./configure.ac src/Makefile.am src/serv...

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/03/21 21:45:44

Modified files:
        .              : configure.ac 
        src            : Makefile.am 
        src/server     : server.cpp 

Log message:
        use FIFODIR instead of LOCALSTATEDIR

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.129&tr2=1.130&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.84&tr2=1.85&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/server/server.cpp.diff?tr1=1.74&tr2=1.75&r1=text&r2=text

Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.129 wesnoth/configure.ac:1.130
--- wesnoth/configure.ac:1.129  Sun Mar 20 22:49:53 2005
+++ wesnoth/configure.ac        Mon Mar 21 21:45:43 2005
@@ -9,7 +9,7 @@
 dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["server.wesnoth.org"], [The default 
server for this version])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default 
server for this version])
 
-AC_REVISION([$Revision: 1.129 $])
+AC_REVISION([$Revision: 1.130 $])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([src/actions.cpp])
@@ -131,6 +131,12 @@
              [server=$enableval],
              [server=no])
 
+AC_ARG_WITH([fifodir],
+                AS_HELP_STRING([--with-fifodir], [directory for the wesnothd 
fifo socket file]),
+             [fifodir=$withval],
+             [fifodir=$localstatedir/run/wesnotd])
+AC_SUBST([fifodir])
+
 AC_ARG_WITH([server-uid],
                  AS_HELP_STRING([--with-server-uid]. [user id of the user who 
runs wesnothd]),
              [serveruid=$withval],
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.84 wesnoth/src/Makefile.am:1.85
--- wesnoth/src/Makefile.am:1.84        Mon Mar 21 12:27:05 2005
+++ wesnoth/src/Makefile.am     Mon Mar 21 21:45:43 2005
@@ -538,7 +538,7 @@
 wesnoth_zip_LDADD = @SDL_LIBS@ @SDL_NET_LIBS@
 
 AM_CXXFLAGS = -I $(srcdir)/sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
-       -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) 
-DLOCALSTATEDIR=\"$(localstatedir)\"
+       -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR) -DFIFODIR=\"$(fifodir)\"
 
 AM_CFLAGS = -I $(srcdir)/sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
        -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
@@ -574,8 +574,8 @@
 
 if SERVER
 install-exec-hook:
-       mkdir -p -m 0700 $(localstatedir)/wesnothd
-       chown $(serveruid):$(servergid) $(localstatedir)/wesnothd
+       mkdir -p -m 0700 $(fifodir)
+       chown $(serveruid):$(servergid) $(fifodir)
 
 uninstall-hook:
        rm -rf $(localstatedir)/wesnothd/
Index: wesnoth/src/server/server.cpp
diff -u wesnoth/src/server/server.cpp:1.74 wesnoth/src/server/server.cpp:1.75
--- wesnoth/src/server/server.cpp:1.74  Sun Mar 20 22:49:53 2005
+++ wesnoth/src/server/server.cpp       Mon Mar 21 21:45:44 2005
@@ -870,10 +870,10 @@
 
        network::set_default_send_size(4096);
 
-#ifndef LOCALSTATEDIR
-# define LOCALSTATEDIR "/var/run"
+#ifndef FIFODIR
+# define FIFODIR "/var/run/wesnothd"
 #endif
-       std::string fifo_path = std::string(LOCALSTATEDIR) + "/wesnothd/socket";
+       std::string fifo_path = std::string(FIFODIR) + "/socket";
 
        for(int arg = 1; arg != argc; ++arg) {
                const std::string val(argv[arg]);