summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2020-04-23 22:45:39 -0400
committerJesse Luehrs <doy@tozt.net>2020-04-23 22:45:39 -0400
commit8f5eccb4820244e0eb8c35417b1ee3026ae702b4 (patch)
tree4c1a757f06b2e2eb6dfc20bcba6b71ea21c9c02e /Makefile
parentc62a4ca2600db9e1ad687f388f49deadebf7033c (diff)
downloadconf-8f5eccb4820244e0eb8c35417b1ee3026ae702b4.tar.gz
conf-8f5eccb4820244e0eb8c35417b1ee3026ae702b4.zip
fix more instances of the make bug
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 80a752c..fdf72b3 100644
--- a/Makefile
+++ b/Makefile
@@ -94,14 +94,16 @@ MKDIR = @mkdir -p
RM = @rm -f
RMDIR = @rmdir -p --ignore-fail-on-non-empty
+# force shell instead of exec to work around
+# https://savannah.gnu.org/bugs/?57962 since i have ~/.bin/git as a directory
+GIT = @:; git
+
# named targets
build : submodules $(BUILD)
-# force shell instead of exec to work around
-# https://savannah.gnu.org/bugs/?57962 since i have ~/.bin/git as a directory
submodules :
- @:; git submodule update --init --recursive
+ $(GIT) submodule update --init --recursive
install :: all $(INSTALLED)
@chmod 600 ssh/cao_key
@@ -115,13 +117,13 @@ clean ::
$(RMDIR) $(INSTALLED_DIRS)
update :
- @git submodule foreach '(if [ $$path == "vim/pack/filetype/start/perl" ]; then git checkout dev; else git checkout master; fi) && git pull'
+ $(GIT) submodule foreach '(if [ $$path == "vim/pack/filetype/start/perl" ]; then git checkout dev; else git checkout master; fi) && git pull'
versions :
- @git submodule foreach -q 'printf "%-53s" " $$path" && GIT_PAGER=cat git show -s --format=format:%cI%n $$sha1'
+ $(GIT) submodule foreach -q 'printf "%-53s" " $$path" && GIT_PAGER=cat git show -s --format=format:%cI%n $$sha1'
updates :
- @git submodule foreach -q 'if [ $$path == "vim/pack/filetype/start/perl" ]; then if [ $$(git rev-parse dev) != $$sha1 ]; then git lg dev...$$sha1; fi; else if [ $$(git rev-parse master) != $$sha1 ]; then git lg master...$$sha1; fi; fi'
+ $(GIT) submodule foreach -q 'if [ $$path == "vim/pack/filetype/start/perl" ]; then if [ $$(git rev-parse dev) != $$sha1 ]; then git lg dev...$$sha1; fi; else if [ $$(git rev-parse master) != $$sha1 ]; then git lg master...$$sha1; fi; fi'
.PHONY: submodules build install clean update versions updates