From 462ae76daefc4f536f474982b4452e640ea48350 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Tue, 26 Jul 2005 20:20:48 +0000
Subject: [PATCH] r4041: Removed custom platform detection (which was designed
 to allow a single copy of ROX-Filer to contain binaries for multiple
 platforms). Let the packaging system deal with it (Thomas Leonard).

---
 ROX-Filer/AppRun           | 17 +++--------------
 ROX-Filer/Help/Changes     |  6 ++++++
 ROX-Filer/src/Makefile.in  |  6 ++----
 ROX-Filer/src/configure.in | 19 +++++--------------
 4 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/ROX-Filer/AppRun b/ROX-Filer/AppRun
index 763418ff..5d9338b9 100755
--- a/ROX-Filer/AppRun
+++ b/ROX-Filer/AppRun
@@ -5,15 +5,6 @@ PROG=ROX-Filer
 APP_DIR=`dirname "$0"`
 APP_DIR=`cd "$APP_DIR";pwd`; export APP_DIR
 
-if [ "x$PLATFORM" = x ]; then
-	ARCH=`uname -m`
-	case "$ARCH" in
-		i?86) ARCH=ix86 ;;
-	esac
-
-	PLATFORM=`uname -s`-"$ARCH" export PLATFORM
-fi
-
 DEBUGGER=""
 
 case $1 in
@@ -43,9 +34,7 @@ case $1 in
 		[ ! -d "$BUILDDIR" ] && mkdir "$BUILDDIR"
 		rm -f "$BUILDDIR/config.cache"
 		rm -f "$APP_DIR/src/config.h"	# (for upgrading)
-		cd "$BUILDDIR" && "$APP_DIR/src/configure" --enable-rox    \
-					--with-platform="$PLATFORM" \
-					"$@" \
+		cd "$BUILDDIR" && "$APP_DIR/src/configure" "$@" \
 			&& make clean && make && echo Done >&2 && exit 0
 		echo Compile failed >&2
 		echo Press Return... >&2
@@ -60,13 +49,13 @@ if [ -z "$XDG_DATA_DIRS" -a -d /uri/0install/zero-install.sourceforge.net ]; the
   export XDG_DATA_DIRS
 fi
 
-BIN="$APP_DIR/$PLATFORM/$PROG"
+BIN="$APP_DIR/$PROG"
 
 if [ -x "$BIN" ]; then
   exec $DEBUGGER "$BIN" $DEBUG_OPTIONS "$@"
 else
   echo "ERROR from $0:" >&2
-  echo "I cannot find an executable file for your host type ($PLATFORM)." >&2
+  echo "I cannot find an executable binary." >&2
   echo "Trying to compile..." >&2
   if [ -n "$DISPLAY" ]; then
     xterm -e "$0" --compile
diff --git a/ROX-Filer/Help/Changes b/ROX-Filer/Help/Changes
index 5a6d4542..8c427e61 100644
--- a/ROX-Filer/Help/Changes
+++ b/ROX-Filer/Help/Changes
@@ -2,6 +2,12 @@
 			A RISC OS-like filer for X
 			by Thomas Leonard
 
+26-Jul-2005
+~~~~~~~~~~~
+Removed custom platform detection (which was designed to allow a single
+copy of ROX-Filer to contain binaries for multiple platforms). Let the
+packaging system deal with it (Thomas Leonard).
+
 25-Jul-2005
 ~~~~~~~~~~~
 Check for shared-mime-info 0.16 when building (Stephen Watson).
diff --git a/ROX-Filer/src/Makefile.in b/ROX-Filer/src/Makefile.in
index a971cf79..00349aa7 100644
--- a/ROX-Filer/src/Makefile.in
+++ b/ROX-Filer/src/Makefile.in
@@ -1,8 +1,7 @@
 SHELL = @SHELL@
 srcdir = @srcdir@
 VPATH = @srcdir@
-PLATFORM = @with_platform@
-PLATFORM_DIR = $(srcdir)/../${PLATFORM}
+PLATFORM_DIR = $(srcdir)/..
 CC = @CC@
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -46,7 +45,6 @@ OBJECTS = abox.o action.o appinfo.o appmenu.o bind.o bookmarks.o	\
 
 ${PROG}: ${OBJECTS}
 	${CC} -o "${PROG}" ${OBJECTS} ${LDFLAGS}
-	[ -d "${PLATFORM_DIR}" ] || mkdir "${PLATFORM_DIR}"
 	mv "${PROG}" "${PLATFORM_DIR}"
 	-(cd "${PLATFORM_DIR}" && \
 	 objcopy --only-keep-debug ROX-Filer ROX-Filer.dbg && \
@@ -66,7 +64,7 @@ config.h: config.h.in
 	./config.status
 
 config.status: configure
-	APP_DIR="$(srcdir)/.." $(srcdir)/configure --with-platform="${PLATFORM}" --enable-rox
+	APP_DIR="$(srcdir)/.." $(srcdir)/configure
 
 configure: configure.in
 	cd $(srcdir) && autoconf
diff --git a/ROX-Filer/src/configure.in b/ROX-Filer/src/configure.in
index 306c7a15..0eb3e1ef 100644
--- a/ROX-Filer/src/configure.in
+++ b/ROX-Filer/src/configure.in
@@ -2,19 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(main.c)
 AC_CONFIG_HEADER(config.h)
 
-AC_ARG_WITH(platform,
-[  --with-platform	  platform name, as detected by AppRun],
-[AC_SUBST(with_platform)],
-[
-AC_MSG_ERROR([
-
-Please do not run 'configure' manually - instead, run the AppRun script with
-the --compile option, like this:
-	$ ROX-Filer/AppRun --compile
-
-Thank you.
-])
-])
+[ if [ -f configure ]; then ]
+	AC_MSG_ERROR([Please run configure from the build directory (try ../AppRun --compile)])
+	exit 1
+fi
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -160,7 +151,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' $APP_DIR/AppInfo.xml`
+VERSION=`sed -n 's/^.*<Version>\([.0-9]*\).*<\/Version>.*$/\1/p' ../AppInfo.xml`
 ]
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_MSG_RESULT(version $VERSION)
-- 
2.11.4.GIT