diff options
Diffstat (limited to 'src/templating/mustach-original-Makefile')
| -rw-r--r-- | src/templating/mustach-original-Makefile | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/templating/mustach-original-Makefile b/src/templating/mustach-original-Makefile index e902b2c71..6d90f33d9 100644 --- a/src/templating/mustach-original-Makefile +++ b/src/templating/mustach-original-Makefile @@ -1,7 +1,7 @@ # version MAJOR := 1 MINOR := 2 -REVIS := 4 +REVIS := 6 # installation settings DESTDIR ?= @@ -214,7 +214,9 @@ mustach-jansson.o: mustach-jansson.c mustach.h mustach-wrap.h mustach-jansson.h .PHONY: install install: all $(INSTALL) -d $(DESTDIR)$(BINDIR) - $(INSTALL) -m0755 mustach $(DESTDIR)$(BINDIR)/ + if test "${tool}" != "none"; then \ + $(INSTALL) -m0755 mustach $(DESTDIR)$(BINDIR)/; \ + fi $(INSTALL) -d $(DESTDIR)$(INCLUDEDIR)/mustach $(INSTALL) -m0644 $(HEADERS) $(DESTDIR)$(INCLUDEDIR)/mustach $(INSTALL) -d $(DESTDIR)$(LIBDIR) @@ -236,6 +238,13 @@ uninstall: rm -rf $(DESTDIR)$(INCLUDEDIR)/mustach # testing +ifeq ($(valgrind),no) + NOVALGRIND := 1 +else + NOVALGRIND := $(shell which -s valgrind && echo 0 || echo 1) +endif +export NOVALGRIND + .PHONY: test test-basic test-specs test: basic-tests spec-tests @@ -245,7 +254,9 @@ basic-tests: mustach @$(MAKE) -C test3 test @$(MAKE) -C test4 test @$(MAKE) -C test5 test -# @$(MAKE) -C test6 test + @$(MAKE) -C test6 test + @$(MAKE) -C test7 test + @$(MAKE) -C test8 test spec-tests: $(TESTSPECS) @@ -291,6 +302,8 @@ clean: @$(MAKE) -C test4 clean @$(MAKE) -C test5 clean @$(MAKE) -C test6 clean + @$(MAKE) -C test7 clean + @$(MAKE) -C test8 clean # manpage .PHONY: manuals @@ -298,3 +311,4 @@ manuals: mustach.1.gz mustach.1.gz: mustach.1.scd if which scdoc >/dev/null 2>&1; then scdoc < mustach.1.scd | gzip > mustach.1.gz; fi + |