From 290bb4d2b70fc8126df4a4154ddd861c942d5edf Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Wed, 4 Mar 2009 13:56:29 +0000
Subject: [PATCH] 2009-03-04 15:02 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/make_gnu.sh     * small cleanup

---
 harbour/ChangeLog   |  4 ++++
 harbour/make_gnu.sh | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c27e5bc802..f01e38dfbe 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-04 15:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/make_gnu.sh
+    * small cleanup
+
 2009-03-04 14:12 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * doc/man/hbmk.1
     * Updated. Blindly.
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index 8c6e38fc90..ae26437325 100755
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -118,7 +118,12 @@ then
                 export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
                 HB_ARCH64="yes"
                 ;;
+            *[ix]*86)
+                ;;
+            *[ix]*86[^0-9]*)
+                ;;
             *)
+                export HB_USER_CFLAGS="$HB_USER_CFLAGS -fPIC"
                 ;;
         esac
     fi
@@ -148,7 +153,7 @@ if [ "$HB_ARCHITECTURE" = "win" ] || \
 fi
 
 [ -z "$HB_INSTALL_PREFIX" ] && [ -n "$PREFIX" ] && export HB_INSTALL_PREFIX="$PREFIX"
-[ -z "$HB_INSTALL_PREFIX" ] && export HB_INSTALL_PREFIX=/usr/local
+[ -z "$HB_INSTALL_PREFIX" ] && export HB_INSTALL_PREFIX="/usr/local"
 
 # Set to constant value to be consistent with the non-GNU make files.
 
@@ -161,18 +166,15 @@ case "$HB_INSTALL_PREFIX" in
         ;;
 esac
 
-if [ -z "$HB_BIN_INSTALL" ]; then export HB_BIN_INSTALL=$HB_INSTALL_PREFIX/bin; fi
-if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL=$HB_INSTALL_PREFIX/lib$hb_instsubdir; fi
-if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL=$HB_INSTALL_PREFIX/include$hb_instsubdir; fi
+if [ -z "$HB_BIN_INSTALL" ]; then export HB_BIN_INSTALL="$HB_INSTALL_PREFIX/bin"; fi
+if [ -z "$HB_LIB_INSTALL" ]; then export HB_LIB_INSTALL="$HB_INSTALL_PREFIX/lib$hb_instsubdir"; fi
+if [ -z "$HB_INC_INSTALL" ]; then export HB_INC_INSTALL="$HB_INSTALL_PREFIX/include$hb_instsubdir"; fi
 
 if [ "$HB_ARCHITECTURE" = "win" ] || \
    [ "$HB_ARCHITECTURE" = "dos" ] || \
    [ "$HB_ARCHITECTURE" = "os2" ]; then
-    if [ -z "$HB_DOC_INSTALL" ]; then export HB_DOC_INSTALL=$HB_INSTALL_PREFIX/doc; fi
-    mkdir -p $HB_BIN_INSTALL
-    mkdir -p $HB_LIB_INSTALL
-    mkdir -p $HB_INC_INSTALL
-    mkdir -p $HB_DOC_INSTALL
+    if [ -z "$HB_DOC_INSTALL" ]; then export HB_DOC_INSTALL="$HB_INSTALL_PREFIX/doc"; fi
+    mkdir -p "$HB_BIN_INSTALL" "$HB_LIB_INSTALL" "$HB_INC_INSTALL" "$HB_DOC_INSTALL"
 fi
 
 if [ -z "$HB_ARCHITECTURE" ]; then