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

 Path received from commandline can be relative one. Use absolute path instead.


 - ML

diff -Nurd -X.diff_ignore freeciv/bootstrap/fc_svnrev_gen.h.in freeciv/bootstrap/fc_svnrev_gen.h.in
--- freeciv/bootstrap/fc_svnrev_gen.h.in	2007-11-27 21:57:24.000000000 +0200
+++ freeciv/bootstrap/fc_svnrev_gen.h.in	2008-03-24 02:08:25.000000000 +0200
@@ -12,7 +12,7 @@
 ***********************************************************************/
 
 /* common/fc_svnrev_gen.h is automatically generated from
- * bootstrap/fc_svnrev_gen.h.in. Do not edit fc_svnrev_ge.h, edit
+ * bootstrap/fc_svnrev_gen.h.in. Do not edit fc_svnrev_gen.h, edit
  * fc_svnrev_gen.h.in */
 
 #ifndef FC__FC_SVNREV_H
diff -Nurd -X.diff_ignore freeciv/bootstrap/generate_svnrev.sh freeciv/bootstrap/generate_svnrev.sh
--- freeciv/bootstrap/generate_svnrev.sh	2007-11-27 21:57:24.000000000 +0200
+++ freeciv/bootstrap/generate_svnrev.sh	2008-03-24 02:02:28.000000000 +0200
@@ -10,6 +10,7 @@
 #
 
 # Absolete paths
+SRCROOT=$(cd "$1" ; pwd)
 INPUTDIR=$(cd "$1/bootstrap" ; pwd)
 OUTPUTDIR=$(cd "$2/common" ; pwd)
 
@@ -24,7 +25,7 @@
    REVTMP="r$(svn info 2>/dev/null | grep "^Revision: " | sed 's/^Revision: //')"
    if test "$REVTMP" != "r" ; then
      # This is svn checkout. Check for local modifications
-     if test $(cd "$1" ; svn diff | wc -l) -eq 0 ; then
+     if test $(cd "$SRCROOT" ; svn diff | wc -l) -eq 0 ; then
        REVSTATE=ON
        REV="$REVTMP"
      else
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to