From 5696ba146aacfdf9c8b574716ea6b641af51fd59 Mon Sep 17 00:00:00 2001
From: Stephen Watson <stephen@kerofin.demon.co.uk>
Date: Tue, 25 May 2004 17:04:37 +0000
Subject: [PATCH] r3535: Fix portability of new build system and ensure
 configure can find the version number again.

---
 ROX-Filer/AppRun           | 6 +++---
 ROX-Filer/Help/Changes     | 5 +++++
 ROX-Filer/src/Makefile     | 4 ++--
 ROX-Filer/src/configure.in | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ROX-Filer/AppRun b/ROX-Filer/AppRun
index d5e8ab94..9419fff2 100755
--- a/ROX-Filer/AppRun
+++ b/ROX-Filer/AppRun
@@ -38,9 +38,9 @@ case $1 in
 		  (cd "$APP_DIR/src"; autoconf)
 		fi
 		rm -f "$APP_DIR/src/config.cache"
-		[ ! -d ~/build ] && mkdir ~/build
-		[ ! -d ~/build/"$PROG" ] && mkdir ~/build/"$PROG"
-		cd ~/build/"$PROG" && "$APP_DIR/src/configure" --enable-rox    \
+		[ ! -d $HOME/build ] && mkdir $HOME/build
+		[ ! -d $HOME/build/"$PROG" ] && mkdir $HOME/build/"$PROG"
+		cd $HOME/build/"$PROG" && "$APP_DIR/src/configure" --enable-rox    \
 					--with-platform="$PLATFORM" \
 					"$@" \
 			&& make clean && make && echo Done >&2 && exit 0
diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index b4536432..28be7154 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -2,6 +2,11 @@
 			A RISC OS-like filer for X
 			by Thomas Leonard
 
+25-May-2004
+~~~~~~~~~~~
+Fix portability of new build system and ensure configure can find the 
+version number again (Stephen Watson).
+
 22-May-2004
 ~~~~~~~~~~~
 Build object files in ~/build/ROX-Filer, in case source directory is read-only.
diff --git a/ROX-Filer/src/Makefile b/ROX-Filer/src/Makefile
index ee7de503..176d746d 100644
--- a/ROX-Filer/src/Makefile
+++ b/ROX-Filer/src/Makefile
@@ -3,7 +3,7 @@
 # Use AppRun --compile to create the build directory in the first place.
 
 all:
-	cd ~/build/ROX-Filer && make
+	cd $$HOME/build/ROX-Filer && make
 
 clean:
-	cd ~/build/ROX-Filer && make clean
+	cd $$HOME/build/ROX-Filer && make clean
diff --git a/ROX-Filer/src/configure.in b/ROX-Filer/src/configure.in
index 763c67a1..3ceb5300 100644
--- a/ROX-Filer/src/configure.in
+++ b/ROX-Filer/src/configure.in
@@ -149,7 +149,7 @@ AC_CHECK_HEADERS(attr/xattr.h sys/xattr.h)
 dnl Extract version info from AppInfo.xml
 AC_MSG_CHECKING(extracting version information)
 [
-VERSION=`sed -n 's/^.*<Version>\([.0-9]*\).*<\/Version>.*$/\1/p' ../AppInfo.xml`
+VERSION=`sed -n 's/^.*<Version>\([.0-9]*\).*<\/Version>.*$/\1/p' $APP_DIR/AppInfo.xml`
 ]
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_MSG_RESULT(version $VERSION)
-- 
2.11.4.GIT