Attempted fix to travis oot build failure.

Details:
- Found the likely cause of the Travis CI out-of-tree build failures:
  config.mk was being read from DIST_PATH, rather than the current
  directory.
This commit is contained in:
Field G. Van Zee
2017-12-13 16:12:34 -06:00
parent c01c71c33e
commit 9091a207aa

View File

@@ -139,13 +139,13 @@ CONFIG_MK_FILE := config.mk
#-include $(RELPATH)/$(CONFIG_MK_FILE)
$(info DIST_PATH is '$(DIST_PATH)')
$(info DIST_PATH stripped is '$(strip $(DIST_PATH))')
ifneq ($(strip $(DIST_PATH)),)
$(info including $(DIST_PATH)/$(CONFIG_MK_FILE))
-include $(DIST_PATH)/$(CONFIG_MK_FILE)
else
#ifneq ($(strip $(DIST_PATH)),)
#$(info including $(DIST_PATH)/$(CONFIG_MK_FILE))
#-include $(DIST_PATH)/$(CONFIG_MK_FILE)
#else
$(info including ./$(CONFIG_MK_FILE))
-include ./$(CONFIG_MK_FILE)
endif
#endif
# Detect whether we actually got the configuration file. If we didn't, then
# it is likely that the user has not yet generated it (via configure).