From 88636b3e1151bb811c8afef3053aeba1b8a62b53 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 1 Dec 2009 11:21:30 +0000
Subject: [PATCH] 2009-12-01 12:21 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * config/global.mk     % "De-xmastree"-d two more if/else
 structures.

---
 harbour/ChangeLog        |  4 +++
 harbour/config/global.mk | 56 +++++++++++++++-------------------------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2824cb1bbc..d770ea1fcc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,10 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-01 12:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.mk
+    % "De-xmastree"-d two more if/else structures.
+
 2009-12-01 08:57 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/philes.c
   * src/rtl/philes53.c
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 419e304b57..29d14ad8cd 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1161,20 +1161,16 @@ else
          HB_INSTALL_PREFIX := /boot/common
       else ifeq ($(HB_PLATFORM_UNIX),)
          HB_INSTALL_PREFIX := $(realpath $(TOP)$(ROOT))
+      else ifneq ($(PREFIX),)
+         HB_INSTALL_PREFIX := $(PREFIX)
+      else ifneq ($(DESTDIR),)
+         HB_INSTALL_PREFIX := $(DESTDIR)
       else
-         ifneq ($(PREFIX),)
-            HB_INSTALL_PREFIX := $(PREFIX)
-         else
-            ifneq ($(DESTDIR),)
-               HB_INSTALL_PREFIX := $(DESTDIR)
-            else
-               # Stick to *nix customs. I do not like it, it needs admin.
-               HB_INSTALL_PREFIX := /usr/local
-               # Add postfix for cross builds
-               ifneq ($(HB_HOST_PLAT),$(HB_PLATFORM))
-                  HB_INSTALL_PREFIX += /harbour-$(HB_PLATFORM)-$(HB_COMPILER)
-               endif
-            endif
+         # Stick to *nix customs. I do not like it, it needs admin.
+         HB_INSTALL_PREFIX := /usr/local
+         # Add postfix for cross builds
+         ifneq ($(HB_HOST_PLAT),$(HB_PLATFORM))
+            HB_INSTALL_PREFIX += /harbour-$(HB_PLATFORM)-$(HB_COMPILER)
          endif
       endif
 
@@ -1318,29 +1314,19 @@ ifeq ($(HB_INIT_DONE),)
       ifeq ($(HB_PLATFORM),win)
          ifeq ($(HB_COMPILER),bcc)
             DYNNAME_POST := $(DYNNAME_POST)-bcc
-         else
-            ifeq ($(HB_CPU),x86_64)
-               DYNNAME_POST := $(DYNNAME_POST)-x64
-            else
-               ifeq ($(HB_CPU),ia64)
-                  DYNNAME_POST := $(DYNNAME_POST)-ia64
-               endif
-            endif
+         else ifeq ($(HB_CPU),x86_64)
+            DYNNAME_POST := $(DYNNAME_POST)-x64
+         else ifeq ($(HB_CPU),ia64)
+            DYNNAME_POST := $(DYNNAME_POST)-ia64
          endif
-      else
-         ifeq ($(HB_PLATFORM),wce)
-            DYNNAME_POST := $(DYNNAME_POST)-wce
-            ifeq ($(HB_CPU),arm)
-               DYNNAME_POST := $(DYNNAME_POST)-arm
-            else
-               ifeq ($(HB_CPU),mips)
-                  DYNNAME_POST := $(DYNNAME_POST)-mips
-               else
-                  ifeq ($(HB_CPU),sh)
-                     DYNNAME_POST := $(DYNNAME_POST)-sh
-                  endif
-               endif
-            endif
+      else ifeq ($(HB_PLATFORM),wce)
+         DYNNAME_POST := $(DYNNAME_POST)-wce
+         ifeq ($(HB_CPU),arm)
+            DYNNAME_POST := $(DYNNAME_POST)-arm
+         else ifeq ($(HB_CPU),mips)
+            DYNNAME_POST := $(DYNNAME_POST)-mips
+         else ifeq ($(HB_CPU),sh)
+            DYNNAME_POST := $(DYNNAME_POST)-sh
          endif
       endif