aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Bernoulli <jonas@bernoul.li>2018-11-08 14:36:38 +0100
committerJonas Bernoulli <jonas@bernoul.li>2018-11-08 14:36:38 +0100
commitae9c883b02d74d0d578b61cdc070ee21227c07ab (patch)
treef68b3dbcc69255e1229d7b54111c7daaf6aaa000
parentf07eb85c6090f53c6b15d8a98b4b84eb9db445ab (diff)
make: Add graphql and treepy to the load-path
Magit itself does not actually depend on `graphql' and `treepy' yet, but the most recent `ghub' release does, so compiling Magit would fail without this if that `ghub' release is installed.
-rw-r--r--default.mk18
1 files changed, 18 insertions, 0 deletions
diff --git a/default.mk b/default.mk
index 41bfb84..d7902c9 100644
--- a/default.mk
+++ b/default.mk
@@ -134,6 +134,13 @@ ifeq "$(GHUB_DIR)" ""
GHUB_DIR = $(TOP)../ghub
endif
+GRAPHQL_DIR ?= $(shell \
+ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/graphql-[.0-9]*' 2> /dev/null | \
+ sort | tail -n 1)
+ifeq "$(GRAPHQL_DIR)" ""
+ GRAPHQL_DIR = $(TOP)../graphql
+endif
+
MAGIT_POPUP_DIR ?= $(shell \
find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/magit-popup-[.0-9]*' 2> /dev/null | \
sort | tail -n 1)
@@ -141,6 +148,13 @@ ifeq "$(MAGIT_POPUP_DIR)" ""
MAGIT_POPUP_DIR = $(TOP)../magit-popup
endif
+TREEPY_DIR ?= $(shell \
+ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/treepy-[.0-9]*' 2> /dev/null | \
+ sort | tail -n 1)
+ifeq "$(TREEPY_DIR)" ""
+ TREEPY_DIR = $(TOP)../treepy
+endif
+
WITH_EDITOR_DIR ?= $(shell \
find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/with-editor-[.0-9]*' 2> /dev/null | \
sort | tail -n 1)
@@ -158,12 +172,16 @@ LOAD_PATH = -L $(TOP)/lisp
ifdef CYGPATH
LOAD_PATH += -L $(shell cygpath --mixed $(DASH_DIR))
LOAD_PATH += -L $(shell cygpath --mixed $(GHUB_DIR))
+ LOAD_PATH += -L $(shell cygpath --mixed $(GRAPHQL_DIR))
LOAD_PATH += -L $(shell cygpath --mixed $(MAGIT_POPUP_DIR))
+ LOAD_PATH += -L $(shell cygpath --mixed $(TREEPY_DIR))
LOAD_PATH += -L $(shell cygpath --mixed $(WITH_EDITOR_DIR))
else
LOAD_PATH += -L $(DASH_DIR)
LOAD_PATH += -L $(GHUB_DIR)
+ LOAD_PATH += -L $(GRAPHQL_DIR)
LOAD_PATH += -L $(MAGIT_POPUP_DIR)
+ LOAD_PATH += -L $(TREEPY_DIR)
LOAD_PATH += -L $(WITH_EDITOR_DIR)
endif