From 9091a207aa8c49e279676ea02be533480b3b0d5a Mon Sep 17 00:00:00 2001
From: "Field G. Van Zee" <field@cs.utexas.edu>
Date: Wed, 13 Dec 2017 16:12:34 -0600
Subject: [PATCH] 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.
---
 common.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common.mk b/common.mk
index 2a0f45215..65faaea90 100644
--- a/common.mk
+++ b/common.mk
@@ -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).