git.shiar.nl
/
sheet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b1a88e8
)
tools: git output and pull fallback
author
Mischa POSLAWSKY
<perl@shiar.org>
Tue, 16 May 2017 23:37:30 +0000
(
01:37
+0200)
committer
Mischa POSLAWSKY
<perl@shiar.org>
Mon, 29 May 2017 17:29:34 +0000
(19:29 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 103a3be4fac806b6856aafd303808a1b3c3be62f..64e034bc5eab3c5e3cbb2a34b4b1215e6d937037 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-42,7
+42,8
@@
data/font/%.inc.pl: tools/mkttfinfo data/font/%.ttf
data/xcolors/themes: data/xcolors
data/xcolors:
data/xcolors/themes: data/xcolors
data/xcolors:
- [ -r $@/.git ] && cd $@ && git pull --ff-only
+ @echo git pull or clone $@
+ @[ -r $@/.git ] && cd $@ && git pull --ff-only || true
@[ -e $@ ] || git clone https://github.com/tlatsas/xcolors $@
data/termcol-xcolor.inc.pl: tools/mktermcol-xcolor data/xcolors/themes
@[ -e $@ ] || git clone https://github.com/tlatsas/xcolors $@
data/termcol-xcolor.inc.pl: tools/mktermcol-xcolor data/xcolors/themes
@@
-94,7
+95,8
@@
data/browser: data/browser/support.inc.pl data/browser/usage-wm.inc.pl
data/browser/caniuse/data.json: data/browser/caniuse
data/browser/caniuse:
data/browser/caniuse/data.json: data/browser/caniuse
data/browser/caniuse:
- [ -r $@/.git ] && cd $@ && git pull --ff-only
+ @echo git pull or clone $@
+ @[ -r $@/.git ] && cd $@ && git pull --ff-only || true
@[ -e $@ ] || git clone https://github.com/Fyrd/caniuse.git $@
data/browser/support.inc.pl: tools/mkcaniuse data/browser/caniuse/data.json
@[ -e $@ ] || git clone https://github.com/Fyrd/caniuse.git $@
data/browser/support.inc.pl: tools/mkcaniuse data/browser/caniuse/data.json