diff --git a/Makefile b/Makefile index c6ba506648bec4ece3b536260edc7b4b708f1367..8e2a839a5b2021da8189cfffcc6b5ea692fa878e 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,12 @@ -export RELEASE_DIR_STEM := sinologie-1 +export RELEASE_DIR_STEM := sinology-1 export VERSION := $(file < version.txt) export CONTENT_DIR := $(PWD)/content -# overrides the target of all git commands in this make and the the submake, -# with the effect that changelogs are about the parent repo -export GIT_DIR := $(PWD)/.git -.PHONY: apkg -apkg: build - $(MAKE) -C build +.PHONY: all +all: build +# git commands in submake use the parent repo to generate the changelog, not +# the build repo + GIT_DIR=$(PWD)/.git $(MAKE) -C build apkg announce changelog-last-version .PHONY: mostlyclean mostlyclean: @@ -24,4 +23,4 @@ deepclean: build: build.git build.sha -rm -rf build git clone $(file < build.git) build - cd build && GIT_DIR=$(PWD)/build/.git git reset --hard $(file < build.sha) + cd build && git reset --hard $(file < build.sha)