From 6b504e67b271fc65048758d9a69b2df0e68ed6cb Mon Sep 17 00:00:00 2001
From: John Toman <virtuoussin13@users.sourceforge.net>
Date: Sat, 26 Dec 2009 00:57:26 +0000
Subject: [PATCH] fixes up some problems with the documentation, allows the
 overriding of the qmake binary used during config

git-svn-id: svn://svn.code.sf.net/p/qjoypad/code/trunk@126 c05e91a0-76c8-4ec0-b377-ef19ce7cc080
---
 INSTALL.txt | 25 ++++++++++++++++++++++---
 README.txt  |  8 ++++----
 src/config  | 11 +++++++++--
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index 8194173..674a58e 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,9 +1,28 @@
 For a quick install, just follow these steps:
 
-tar -xzvf qjoypad-3.?.tgz
-cd qjoypad-3.?/src
+tar -xzvf qjoypad-4.?.tgz
+cd qjoypad-4.?/src
 ./config
 make
 make install
 
-If those steps don't work for you, give the README a look!
+If those steps don't work for you, here are some common problems:
+
+Compilations fails with along the lines of:
+axis.h:21: error: expected class-name before ‘{’ token
+axis.h:22: error: ISO C++ forbids declaration of ‘Q_OBJECT’ with no type
+axis.h:24: error: expected ‘;’ before ‘friend’
+axis.h:29: error: ‘QTextStream’ has not been declared
+axis.h:31: error: ‘QTextStream’ has not been declared
+axis.h:40: error: ‘QString’ does not name a type
+axis.h:44: error: ‘QString’ does not name a type
+axis.h:89: error: ISO C++ forbids declaration of ‘QTimer’ with no type
+
+Most likely you're using the Qt3 version of qmake; QJoyPad needs to use Qt4 to 
+work properly.  The config script is supposed to detect this properly, but in
+the event it fails you should find what the proper executable is (if you think
+you've found it run it with the --version option to make sure it is for Qt
+4.0 or greater).  Then rerun the config script with the --qmake4bin=BIN option,
+where BIN is the executable name of the proper qmake binary, or a path to the
+proper qmake binary.
+
diff --git a/README.txt b/README.txt
index 061936a..823a8b3 100644
--- a/README.txt
+++ b/README.txt
@@ -1,11 +1,11 @@
-QJoyPad 3 Documentation
+QJoyPad 4 Documentation
 
-Distributed with QJoyPad 3.4; available online at
+Distributed with QJoyPad 4.0; available online at
 http://qjoypad.sourceforge.net/doc/doc_index.html
 
-Nathan Gaylinn
+John Toman
 
-   wren42@users.sourceforge.net
+   virtuoussin13@users.sourceforge.net
    http://qjoypad.sourceforge.net
      _________________________________________________________
 
diff --git a/src/config b/src/config
index f180fb6..b2c4638 100755
--- a/src/config
+++ b/src/config
@@ -57,6 +57,8 @@ Options:
      --debug        Causes Qjoypad to spit out debugging messages (debug messages
                     will be  compiled in; to get rid of the messages you'll have
                     to recompile).
+    --qmake4bin=EXEC   Overrides the qmake executable used by this script.
+	EXEC may be relative to PATH or an absolute pathname.
     --help          Show this message.
 "; exit 0;;
         --devdir=*) devdir=${arg##*=}
@@ -81,15 +83,20 @@ Options:
         --debug)
             debug_option+="_DEBUG";
             build_mode="debug";;
+	--qmake4bin=*) QMAKE_EXEC=${arg##*=};;
         *)  echo "Unrecognized argument: \"$arg\". Try ./config --help for help."
 	esac
 done
 
-$QMAKE_EXEC -makefile DEVDIR=$devdir PREFIX=$prefix \
+if ( ! $QMAKE_EXEC -makefile DEVDIR=$devdir PREFIX=$prefix \
     "DEFINES += $plain_keys $debug_option" \
     INSTALL_PREFIX=${installdir}/${prefix}/ \
     "CONFIG += $build_mode" \
-    qjoypad.pro
+    qjoypad.pro ); then
+	echo "Config failed.  If you overrode the qmake exec, make sure it
+is valid!  Otherwise, email virtuoussin13@users.sourceforge.net for help";
+exit 1;
+fi
 
 echo "
 Configuring QJoyPad installation...