Testsuite: strip trailing space at -bt output

[users/jgh/exim.git] / test / Makefile.in

diff --git a/test/Makefile.in b/test/Makefile.in
index c96fb4bddbac1407466bc1ee49a31a3b38cccba3..6d3bc55502d1bf660ee209eeee17660ba00e799e 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -4,7 +4,7 @@
 # These variables are set by the configure script.
 
 CC=@CC@
-CFLAGS=@CFLAGS@ @BIND_8_COMPAT@ @DEFS@
+CFLAGS=@CFLAGS@ @CPPFLAGS@ @BIND_8_COMPAT@ @DEFS@
 LDFLAGS=@LDFLAGS@
 CLIENT_SSL=@CLIENT_SSL@
 CLIENT_GNUTLS=@CLIENT_GNUTLS@
@@ -26,8 +26,8 @@ all:            binaries sysbinaries
 
 binaries:      $(BINARIES)
 
-sysbinaries:   FORCE
-               sh -x bin/locate initdb postgres pg_ctl mysqld
+sysbinaries:   FORCE binaries
+               bin/locate initdb postgres pg_ctl mysqld
                ls -la bin.sys
 
 # Compile and link the programs:
@@ -82,7 +82,8 @@ bin/showids:    $(SRC)/showids.c Makefile
                $(CC) $(CFLAGS) $(LDFLAGS) -o bin/showids $(SRC)/showids.c
 
 bin/locate:     $(SRC)/locate.sh Makefile
-               install -m 0755 $(SRC)/locate.sh bin/locate
+               cp $(SRC)/locate.pl bin/locate
+               chmod 0755 bin/locate
 
 clean:;         rm -rf $(BINARIES) bin.sys