From 4af098024317ee20833aedd3bdd770f73e79a9e1 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 10 May 2017 17:04:14 -0400
Subject: fixit

---
 build-aux/Makefile.each.tail/50-sd.mk           |  4 ++--
 build-aux/Makefile.each.tail/70-sdcompletion.mk | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'build-aux/Makefile.each.tail')

diff --git a/build-aux/Makefile.each.tail/50-sd.mk b/build-aux/Makefile.each.tail/50-sd.mk
index 7927a31917..b7afb178a2 100644
--- a/build-aux/Makefile.each.tail/50-sd.mk
+++ b/build-aux/Makefile.each.tail/50-sd.mk
@@ -88,7 +88,7 @@ $(outdir)/%.c: $(srcdir)/%.gperf
 $(outdir)/%.c: $(outdir)/%.gperf
 	$(AM_V_GPERF)$(GPERF) < $< > $@
 
-$(addprefix $(outdir)/,_bogus_m4 $(patsubst %.m4,%,$(filter %.m4,$(files.src)))): $(outdir)/%: $(srcdir)/%.m4 $(top_builddir)/config.status
+$(addprefix $(outdir)/,$(patsubst %.m4,%,$(filter %.m4,$(files.src)))): $(outdir)/%: $(srcdir)/%.m4 $(top_builddir)/config.status
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-$(addprefix $(outdir)/,_bogus_m4_in $(patsubst %.m4.in,%,$(filter %.m4.in,$(files.src)))): $(outdir)/%: $(outdir)/%.m4 $(top_builddir)/config.status
+$(addprefix $(outdir)/,$(patsubst %.m4.in,%,$(filter %.m4.in,$(files.src)))): $(outdir)/%: $(outdir)/%.m4 $(top_builddir)/config.status
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
diff --git a/build-aux/Makefile.each.tail/70-sdcompletion.mk b/build-aux/Makefile.each.tail/70-sdcompletion.mk
index 99677c9407..92c37a235d 100644
--- a/build-aux/Makefile.each.tail/70-sdcompletion.mk
+++ b/build-aux/Makefile.each.tail/70-sdcompletion.mk
@@ -16,8 +16,11 @@ mod.sdcompletion.doc := $(value mod.sdcompletion.doc)
 rootbin_PROGRAMS ?=
 bin_PROGRAMS ?=
 dist_bin_SCRIPTS ?=
-bashcompletion_DATA ?=
-zshcompletion_DATA ?=
-# We use `dist_` to trick `am` into not putting it in `am.out_DATA`
-dist_bashcompletion_DATA := $(sort $(bashcompletion_DATA) $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS))
-dist_zshcompletion_DATA := $(sort $(zshcompletion_DATA) $(addprefix _,$(notdir $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS))))
+
+_bashcompletion_DATA := $(sort $(bashcompletion_DATA) $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS))
+dist_bashcompletion_DATA   += $(filter     $(files.src),$(_bashcompletion_DATA))
+nodist_bashcompletion_DATA += $(filter-out $(files.src),$(_bashcompletion_DATA))
+
+_zshcompletion_DATA := $(sort $(zshcompletion_DATA) $(addprefix _,$(notdir $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS))))
+dist_zshcompletion_DATA   += $(filter     $(files.src),$(_zshcompletion_DATA))
+nodist_zshcompletion_DATA += $(filter-out $(files.src),$(_zshcompletion_DATA))
-- 
cgit v1.2.3-54-g00ecf