diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-04 13:52:21 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-04 13:52:21 -0500 |
| commit | 2ef8b28334f0f69caf4bec4ecc68fdd85802c185 (patch) | |
| tree | 66dedc0bc5ddab027c1a8debc3fc94f3ae3ebf7b | |
| parent | df2f833665d56f55dfe04045248f1a38b83cb3fd (diff) | |
Wow, I botched some Makefile stuff
| -rw-r--r-- | common.mk | 5 | ||||
| -rw-r--r-- | src/lib/.gitignore | 1 | ||||
| -rw-r--r-- | src/librefetch/.gitignore | 2 | ||||
| -rw-r--r-- | src/librefetch/Makefile | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/librefetch/librefetch-install.in | 0 |
5 files changed, 5 insertions, 5 deletions
@@ -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 ######################################################################## diff --git a/src/lib/.gitignore b/src/lib/.gitignore index e769566..650c85f 100644 --- a/src/lib/.gitignore +++ b/src/lib/.gitignore @@ -1,4 +1,3 @@ common.sh common.sh.in -common.sh.top conf.sh diff --git a/src/librefetch/.gitignore b/src/librefetch/.gitignore new file mode 100644 index 0000000..d34a2fc --- /dev/null +++ b/src/librefetch/.gitignore @@ -0,0 +1,2 @@ +librefetch-install +librefetch-makepkg.conf diff --git a/src/librefetch/Makefile b/src/librefetch/Makefile index d797daf..bbc2384 100644 --- a/src/librefetch/Makefile +++ b/src/librefetch/Makefile @@ -1,3 +1,3 @@ -include ../../common.mk progs = librefetch-install confs = librefetch-makepkg.conf +include ../../common.mk diff --git a/src/librefetch/librefetch-install.in b/src/librefetch/librefetch-install.in index 13ac876..13ac876 100755..100644 --- a/src/librefetch/librefetch-install.in +++ b/src/librefetch/librefetch-install.in |