Fix make dist in a separate build directory without git, really
Make didn't remake sources.mk even though it was a phony target. I don't understand why. But we can just as well create it in its only user, dist-source.
This commit is contained in:
parent
6d6301afe8
commit
dd8921218b
1 changed files with 5 additions and 14 deletions
19
Make.mk
19
Make.mk
|
@ -143,7 +143,7 @@ $(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib)
|
||||||
# Removed by distclean:
|
# Removed by distclean:
|
||||||
distclean := $(ac) $(mk)
|
distclean := $(ac) $(mk)
|
||||||
# Distributed by dist-source from $(srcdir)
|
# Distributed by dist-source from $(srcdir)
|
||||||
src_distgen := $(acdist) sources.mk
|
src_distgen := $(acdist)
|
||||||
# Distributed by dist-client from $(srcdir)/src/client
|
# Distributed by dist-client from $(srcdir)/src/client
|
||||||
cli_distgen := $(acdistcli)
|
cli_distgen := $(acdistcli)
|
||||||
|
|
||||||
|
@ -320,23 +320,14 @@ $(topics.html): info/emp2html.pl
|
||||||
info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc)
|
info.ps: info/TROFF.MAC info/INFO.MAC $(ttop) $(tsubj) $(tsrc)
|
||||||
groff $^ >$@
|
groff $^ >$@
|
||||||
|
|
||||||
# List of source files
|
|
||||||
|
|
||||||
# Note: $(srcdir)/sources.mk is only included when the source tree
|
|
||||||
# came from a tarball rather than git. The following rule creates a
|
|
||||||
# it only for putting it into the tarball. It is not used otherwise
|
|
||||||
# in this build.
|
|
||||||
ifeq ($(revctrl),git)
|
|
||||||
.PHONY: $(srcdir)/sources.mk
|
|
||||||
$(srcdir)/sources.mk:
|
|
||||||
echo "src := $(src)" >$@
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Distributing
|
# Distributing
|
||||||
|
|
||||||
.PHONY: dist-source
|
.PHONY: dist-source
|
||||||
dist-source: $(src_distgen)
|
dist-source: $(src_distgen)
|
||||||
$(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src)
|
ifeq ($(revctrl),git)
|
||||||
|
echo "src := $(src)" >$(srcdir)/sources.mk
|
||||||
|
endif
|
||||||
|
$(tarball) $(TARNAME)-$(VERSION) -C $(srcdir) $(src_distgen) $(src) sources.mk
|
||||||
|
|
||||||
.PHONY: dist-client
|
.PHONY: dist-client
|
||||||
dist-client: $(cli_distgen)
|
dist-client: $(cli_distgen)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue