diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/auditordb/Makefile.am | 4 | ||||
| -rw-r--r-- | src/exchangedb/Makefile.am | 8 | ||||
| -rwxr-xr-x | src/templating/dotest.sh | 1 | ||||
| -rw-r--r-- | src/templating/mustach-original-Makefile | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/auditordb/Makefile.am b/src/auditordb/Makefile.am index 3e7d83d09..c0282e9c9 100644 --- a/src/auditordb/Makefile.am +++ b/src/auditordb/Makefile.am @@ -31,12 +31,12 @@ CLEANFILES = \ auditor-0002.sql procedures.sql: procedures.sql.in auditor_do_*.sql - chmod +w $@ || true + chmod +w $@ 2> /dev/null || true gcc -E -P -undef - < procedures.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@ chmod ugo-w $@ auditor-0002.sql: auditor-0002.sql.in 0002-*.sql - chmod +w $@ || true + chmod +w $@ 2> /dev/null || true gcc -E -P -undef - < auditor-0002.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@ chmod ugo-w $@ diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am index d57d690a1..fd993f968 100644 --- a/src/exchangedb/Makefile.am +++ b/src/exchangedb/Makefile.am @@ -47,22 +47,22 @@ CLEANFILES = \ procedures.sql procedures.sql: procedures.sql.in exchange_do_*.sql - chmod +w $@ || true + chmod +w $@ 2> /dev/null || true gcc -E -P -undef - < procedures.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@ chmod ugo-w $@ exchange-0002.sql: exchange-0002.sql.in 0002-*.sql - chmod +w $@ || true + chmod +w $@ 2> /dev/null || true gcc -E -P -undef - < exchange-0002.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@ chmod ugo-w $@ exchange-0003.sql: exchange-0003.sql.in 0003-*.sql - chmod +w $@ || true + chmod +w $@ 2> /dev/null || true gcc -E -P -undef - < exchange-0003.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@ chmod ugo-w $@ exchange-0004.sql: exchange-0004.sql.in 0004-*.sql - chmod +w $@ || true + chmod +w $@ 2> /dev/null || true gcc -E -P -undef - < exchange-0004.sql.in 2>/dev/null | sed -e "s/--.*//" | awk 'NF' - >$@ chmod ugo-w $@ diff --git a/src/templating/dotest.sh b/src/templating/dotest.sh index 7945ca5c5..7b24bcf9f 100755 --- a/src/templating/dotest.sh +++ b/src/templating/dotest.sh @@ -7,6 +7,7 @@ exit_fail() { } mustach=${mustach:-../mustach} +ldd "${mustach}" echo starting test if test "$NOVALGRIND" = 1 then diff --git a/src/templating/mustach-original-Makefile b/src/templating/mustach-original-Makefile index c1ddbe63f..a45bd5fa1 100644 --- a/src/templating/mustach-original-Makefile +++ b/src/templating/mustach-original-Makefile @@ -241,7 +241,7 @@ uninstall: ifeq ($(valgrind),no) NOVALGRIND := 1 else - NOVALGRIND := $(shell which -s valgrind && echo 0 || echo 1) + NOVALGRIND := $(valgrind --version > /dev/null && echo 0 || echo 1) endif export NOVALGRIND @@ -311,4 +311,3 @@ 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 - |