Merge "Fix creating _dist_<goal> targets under !dist"

2018-10-21 17:55:58 +00:00
parent b519ed5983 c2fdc230fc
commit f1dafa30e4
1 changed files with 2 additions and 1 deletions
--- a/packaging/distdir.mk
+++ b/packaging/distdir.mk
@@ -24,7 +24,8 @@ $(foreach pair,$(DIST_GOAL_OUTPUT_PAIRS), \
  $(eval output := $(call word-colon,2,$(pair))) \
  $(eval .PHONY: _dist_$$(goal)) \
  $(if $(call streq,$(DIST),true),\
-    $(eval _dist_$$(goal): $$(DIST_DIR)/$$(output))))
+    $(eval _dist_$$(goal): $$(DIST_DIR)/$$(output)), \
+    $(eval _dist_$$(goal):)))

 define copy-one-dist-file
 $(2): $(1)