2009-08-24 04:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbqt/Makefile
  * contrib/gtqtc/Makefile
    ! Fixed prev change after testing.

  * ChangeLog
    ! Missed item from recent entry:
      * config/global.mk
        * Changed HB_INSTALL_PREFIX macros to lowercase:
          {hb_top}, {hb_comp}, {hb_plat}, {hb_cpu}

harbour/ChangeLog

@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-24 04:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/Makefile
+  * contrib/gtqtc/Makefile
+    ! Fixed prev change after testing.
+
+  * ChangeLog
+    ! Missed item from recent entry:
+      * config/global.mk
+        * Changed HB_INSTALL_PREFIX macros to lowercase:
+          {hb_top}, {hb_comp}, {hb_plat}, {hb_cpu}
+
 2009-08-24 03:24 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/config/globsh.mk
     ! added missing command separator
@@ -135,6 +146,10 @@
   * doc/gmake.txt
     * Little updates.
 
+  * config/global.mk
+    * Changed HB_INSTALL_PREFIX macros to lowercase:
+      {hb_top}, {hb_comp}, {hb_plat}, {hb_cpu}
+
   * harbour-win-spec
   * doc/gmake.txt
   * doc/linux1st.txt
@@ -2812,9 +2827,9 @@
     * Changed to default HB_INSTALL_PREFIX to /usr/local on
       *nix systems. I very much don't like this (even though I
       understand why it's done that way).
-    + Added {HB_TOP} macro for HB_INSTALL_PREFIX, so if someone
+    + Added {hb_top} macro for HB_INSTALL_PREFIX, so if someone
       wants to install Harbour in its own dir, it enough to do:
-      export/set HB_INSTALL_PREFIX={HB_TOP}.
+      export/set HB_INSTALL_PREFIX={hb_top}.
       This is crucial if someone doesn't want to "pollute" system
       areas with Harbour builds, doesn't want to use admin rights
       to make the install, or if someone wants to use multiple
@@ -4047,7 +4062,7 @@
     + Added autofill of HB_INSTALL_PREFIX if not specified.
       (work in progress, might change in the future)
     + Added support for "macro" values in HB_INSTALL_PREFIX:
-      {HB_ARCH}, {HB_COMP}, {HB_CPU}. They will be replaced
+      {hb_arch}, {hb_comp}, {hb_cpu}. They will be replaced
       by corresponding value. This is a small steps towards
       moving to GNU Make bases autodetection an moving away
       from starter script (make_gnu.*) usage.

harbour/contrib/gtqtc/Makefile

@@ -24,9 +24,6 @@ ifeq ($(PREREQ_MISS),)
          ifeq ($(HB_XBUILD),)
             ifeq ($(HB_OS_UNIX),yes)
                HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-               ifeq ($(HB_PLATFORM),darwin)
-                  HB_INC_QT += /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore
-               endif
             endif
          endif
       endif
@@ -34,6 +31,17 @@ ifeq ($(PREREQ_MISS),)
       ifneq ($(HB_INC_QT),)
 
          HB_INC_QT_OK := $(strip $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),)))
+         ifeq ($(HB_PLATFORM),darwin)
+            ifeq ($(HB_INC_QT_OK),)
+               HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
+               ifeq ($(HB_INC_QT_OK),spec)
+                  HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+                  HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+                  HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+                  HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+               endif
+            endif
+         endif
 
          ifneq ($(HB_INC_QT_OK),)
 
@@ -42,12 +50,7 @@ ifeq ($(PREREQ_MISS),)
                HB_CFLAGS += -DQT_NODLL
             endif
 
-            ifeq ($(HB_INC_QT_OK),/Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore)
-               HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
-               HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
-               HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
-               HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
-            else
+            ifneq ($(HB_INC_QT_OK),spec)
                HB_CFLAGS += $(foreach d,$(HB_INC_QT_OK),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
             endif
 

harbour/contrib/hbqt/Makefile

@@ -24,9 +24,6 @@ ifeq ($(PREREQ_MISS),)
          ifeq ($(HB_XBUILD),)
             ifeq ($(HB_OS_UNIX),yes)
                HB_INC_QT := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-               ifeq ($(HB_PLATFORM),darwin)
-                  HB_INC_QT += /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore
-               endif
             endif
          endif
       endif
@@ -34,6 +31,17 @@ ifeq ($(PREREQ_MISS),)
       ifneq ($(HB_INC_QT),)
 
          HB_INC_QT_OK := $(strip $(foreach d, $(HB_INC_QT), $(if $(wildcard $(d)/Qt/qglobal.h),$(d),)))
+         ifeq ($(HB_PLATFORM),darwin)
+            ifeq ($(HB_INC_QT_OK),)
+               HB_INC_QT_OK := $(if $(wildcard /Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore),spec,)
+               ifeq ($(HB_INC_QT_OK),spec)
+                  HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
+                  HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
+                  HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
+                  HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
+               endif
+            endif
+         endif
 
          ifneq ($(HB_INC_QT_OK),)
 
@@ -42,12 +50,7 @@ ifeq ($(PREREQ_MISS),)
                HB_CFLAGS += -DQT_NODLL
             endif
 
-            ifeq ($(HB_INC_QT_OK),/Library/Frameworks/QtCore.framework/Versions/4/Headers/QtCore)
-               HB_CFLAGS += -I/Library/Frameworks/QtCore.framework/Headers
-               HB_CFLAGS += -I/Library/Frameworks/QtGui.framework/Headers
-               HB_CFLAGS += -I/Library/Frameworks/QtNetwork.framework/Headers
-               HB_CFLAGS += -I/Library/Frameworks/QtWebKit.framework/Headers
-            else
+            ifneq ($(HB_INC_QT_OK),spec)
                HB_CFLAGS += $(foreach d,$(HB_INC_QT_OK),-I$(d) -I$(d)/Qt -I$(d)/QtCore -I$(d)/QtGui -I$(d)/QtNetwork -I$(d)/QtWebKit)
             endif