hi,
viktor, is there any compelling reason against this one? it removes a
level of if-nests, and inlines an expression used only once. positive
and negative tests look ok here.
Index: config/global.mk
===================================================================
--- config/global.mk (revision 13441)
+++ config/global.mk (working copy)
@@ -52,13 +52,12 @@
.PHONY: all clean install
need := 3.81
-ok := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
-ifeq ($(ok),)
+ifeq ($(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need)))),)
$(error ! Error: GNU Make version $(MAKE_VERSION) found, $(need) or upper
needed for Harbour)
-else
+endif
need := 3.81
MAKE_381 := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
@@ -1435,6 +1434,4 @@
include $(TOP)$(ROOT)config/$(HB_PLATFORM)/global.mk
include $(TOP)$(ROOT)config/globsh.mk
-endif
-
endif # GLOBAL_MK_
--
[-]
mkdir /nonexistent
Index: config/global.mk
===================================================================
--- config/global.mk (revision 13441)
+++ config/global.mk (working copy)
@@ -52,13 +52,12 @@
.PHONY: all clean install
need := 3.81
-ok := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
-ifeq ($(ok),)
+ifeq ($(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need)))),)
$(error ! Error: GNU Make version $(MAKE_VERSION) found, $(need) or upper needed for Harbour)
-else
+endif
need := 3.81
MAKE_381 := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
@@ -1435,6 +1434,4 @@
include $(TOP)$(ROOT)config/$(HB_PLATFORM)/global.mk
include $(TOP)$(ROOT)config/globsh.mk
-endif
-
endif # GLOBAL_MK_
_______________________________________________
Harbour mailing list (attachment size limit: 40KB)
Harbour@harbour-project.org
http://lists.harbour-project.org/mailman/listinfo/harbour
