<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40052 >

 Minor cleanup for ser & civ scripts.

 We already require new enough autoconf to depend on it to provide
abs_top_srcdir and abs_top_builddir.
 autogen.sh set obsolete (otherwise unused) variable FC_USE_NEWAUTOCONF


 - ML

diff -Nurd -X.diff_ignore freeciv/autogen.sh freeciv/autogen.sh
--- freeciv/autogen.sh	2007-08-04 18:39:15.000000000 +0300
+++ freeciv/autogen.sh	2008-01-27 15:13:38.000000000 +0200
@@ -17,7 +17,6 @@
 #DEBUG=defined
 
 FC_USE_NLS=yes
-FC_USE_NEWAUTOCONF=yes
 FC_HELP=no
 
 # Leave out NLS checks
diff -Nurd -X.diff_ignore freeciv/bootstrap/civ.in freeciv/bootstrap/civ.in
--- freeciv/bootstrap/civ.in	2007-08-04 18:37:57.000000000 +0300
+++ freeciv/bootstrap/civ.in	2008-01-27 15:12:04.000000000 +0200
@@ -16,14 +16,10 @@
 
 BUILDDIR=`dirname $0`
 
-# Use cd + pwd instead of manual concatentation in case of absolute paths
-BUILDDATA=$(cd $BUILDDIR/data ; pwd)
-SRCDATA=$(cd $BUILDDIR ; cd @top_srcdir@/data ; pwd)
-
 if [ "x$FREECIV_PATH" = "x" ] ; then
   FREECIV_PATH=".:data:~/.freeciv"
 fi
-export FREECIV_PATH="$FREECIV_PATH:$BUILDDATA:$SRCDATA"
+export FREECIV_PATH="$FREECIV_PATH:@abs_top_builddir@/data:@abs_top_srcdir@/data"
 
 [ -x $BUILDDIR/client/civclient ] && EXE=$BUILDDIR/client/civclient
 [ -x $BUILDDIR/civclient ] && EXE=$BUILDDIR/civclient
diff -Nurd -X.diff_ignore freeciv/bootstrap/ser.in freeciv/bootstrap/ser.in
--- freeciv/bootstrap/ser.in	2007-08-04 18:37:57.000000000 +0300
+++ freeciv/bootstrap/ser.in	2008-01-27 15:12:39.000000000 +0200
@@ -16,14 +16,10 @@
 
 BUILDDIR=`dirname $0`
 
-# Use cd + pwd instead of manual concatentation in case of absolute paths
-BUILDDATA=$(cd $BUILDDIR/data ; pwd)
-SRCDATA=$(cd $BUILDDIR ; cd @top_srcdir@/data ; pwd)
-
 if [ "x$FREECIV_PATH" = "x" ] ; then
   FREECIV_PATH=".:data:~/.freeciv"
 fi
-export FREECIV_PATH="$FREECIV_PATH:$BUILDDATA:$SRCDATA"
+export FREECIV_PATH="$FREECIV_PATH:@abs_top_builddir@/data:@abs_top_srcdir@/data"
 
 [ -x $BUILDDIR/server/civserver ] && EXE=$BUILDDIR/server/civserver
 [ -x $BUILDDIR/civserver ] && EXE=$BUILDDIR/civserver
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to