From 2ef8b28334f0f69caf4bec4ecc68fdd85802c185 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 4 Jan 2015 13:52:21 -0500 Subject: Wow, I botched some Makefile stuff --- common.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index 3a16cf4..53be7cc 100644 --- a/common.mk +++ b/common.mk @@ -55,7 +55,7 @@ install_files += $(addprefix $(DESTDIR)$(bindir)/,$(progs)) \ $(addprefix $(DESTDIR)$(mandir)/man6/,$(filter %.6,$(mans))) \ $(addprefix $(DESTDIR)$(mandir)/man7/,$(filter %.7,$(mans))) \ $(addprefix $(DESTDIR)$(mandir)/man8/,$(filter %.8,$(mans))) -clean_files += $(patsubst %.in,%,$(copy_files)) $(copy_files) $(mans) $(wildcard *.pot *.ugly*) +clean_files += $(patsubst %.in,%,$(copy_files) $(wildcard *.in)) $(copy_files) $(mans) $(wildcard *.pot *.ugly*) pots += $(filter-out $(no-pots) ,$(sort $(progs) $(libexecs) $(libs))) pot_files += $(addsuffix .pot,$(pots)) @@ -97,11 +97,10 @@ $(sort $(_do_patch)): %: %.ugly Makefile # $(devtoolsdir)/%.in -> %.in -> % %: %.in @echo 'EDIT < $< > $@'; $(edit) <"$<" >"$@" - $(if $(filter-out %.sh,$@),chmod 755 "$@") + $(if $(filter $@,$(progs) $(libexecs)),chmod 755 "$@") # work-around for what I currently believe to be a regression in Make %.sh: %.sh.in @echo 'EDIT < $< > $@'; $(edit) <"$<" >"$@" - $(if $(filter-out %.sh,$@),chmod 755 "$@") # Build ######################################################################## -- cgit v1.2.2