slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make: avoid sed-related error message, mostly

Browse Source 
[ci skip]
This commit is contained in:
Simon Michael 2019-01-31 15:54:43 -08:00
parent 9955f53b9b
commit 29c41dc84b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1117,9 +1117,10 @@ haddock: \
######################## ########################
# changelogs # changelogs
# need GNU sed, it may be called gsed (eg with homebrew)
# -E for extended regular expressions # -E for extended regular expressions
SED:=$(notdir $(shell which gsed || which sed)) -E SED=sed -E
# GNU sed, when needed. It's gsed eg with homebrew. This test may print an error message
GSED=$(notdir $(shell which gsed || which sed)) -E
# --abbrev-commit for short commit hashes # --abbrev-commit for short commit hashes
GITLOG=git log --abbrev-commit GITLOG=git log --abbrev-commit
@ -1165,6 +1166,7 @@ changelogs: */CHANGES.md CHANGES.md \
# inserts a blank line + heading + new items after line 2. # inserts a blank line + heading + new items after line 2.
# dry run: put echo before the last $(SED), ls Makefile | entr bash -c 'make hledger/CHANGES.md && cat hledger/CHANGES.md.new' # dry run: put echo before the last $(SED), ls Makefile | entr bash -c 'make hledger/CHANGES.md && cat hledger/CHANGES.md.new'
# Needs GNU sed to do the r insertion.
%/CHANGES.md: .FORCE \ %/CHANGES.md: .FORCE \
$(call def-help,*/CHANGES.md, add commits to the specified changelog(s) since the tag/commit in the topmost heading ) $(call def-help,*/CHANGES.md, add commits to the specified changelog(s) since the tag/commit in the topmost heading )
$(eval PKGDIR=$(dir $@)) $(eval PKGDIR=$(dir $@))
@ -1177,7 +1179,7 @@ changelogs: */CHANGES.md CHANGES.md \
( printf "\n# $(HEAD)\n\n"; \ ( printf "\n# $(HEAD)\n\n"; \
$(GITLOG) $(CHANGEFMT) $(LAST).. -- $(PKGDIR) | $(CHANGECLEANUP) \ $(GITLOG) $(CHANGEFMT) $(LAST).. -- $(PKGDIR) | $(CHANGECLEANUP) \
) >$@.new ; \ ) >$@.new ; \
$(SED) -i "2r $@.new" $@ ; \ $(GSED) -i "2r $@.new" $@ ; \
echo "$@: added $(LAST)..$(HEAD)" \ echo "$@: added $(LAST)..$(HEAD)" \
) \ ) \
) )