diff options
| author | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2011-06-06 17:49:24 +0000 |
|---|---|---|
| committer | Jasper Lievisse Adriaanse <jasper@cvs.openbsd.org> | 2011-06-06 17:49:24 +0000 |
| commit | 24c9c3c6507d5a14d09774683970421804ee18ba (patch) | |
| tree | c524ae95b9a03e3b0e5ae4d99ccf570b2bd897b8 | |
| parent | a015b40a3d0b2f4f222cbb240eba9ddef219846a (diff) | |
use ${.OBJDIR} instead of poluting ${.CURDIR}
| -rw-r--r-- | regress/usr.bin/pkg-config/Makefile | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/regress/usr.bin/pkg-config/Makefile b/regress/usr.bin/pkg-config/Makefile index 0fb5aacc249..8be01a7fd9f 100644 --- a/regress/usr.bin/pkg-config/Makefile +++ b/regress/usr.bin/pkg-config/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2011/06/06 17:45:53 jasper Exp $ +# $OpenBSD: Makefile,v 1.5 2011/06/06 17:49:23 jasper Exp $ REGRESS_TARGETS= corrupt1 \ corrupt2 \ @@ -12,39 +12,39 @@ REGRESS_TARGETS= corrupt1 \ # Checks for corrupt pkg-config files. corrupt1: # Test for missing variables/fields - @echo "Package 'corrupt1' has no Version: field" > $@.want + @echo "Package 'corrupt1' has no Version: field" > ${.OBJDIR}/$@.want @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ pkg-config \ - --exists $@ 2> $@.got; then false; fi - @diff -u $@.want $@.got + --exists $@ 2> ${.OBJDIR}/$@.got; then false; fi + @diff -u ${.OBJDIR}/$@.want ${.OBJDIR}/$@.got corrupt2: # Test for missing variables/fields - @echo "Package 'corrupt2' has no Name: field" > $@.want + @echo "Package 'corrupt2' has no Name: field" > ${.OBJDIR}/$@.want @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ pkg-config \ - --exists $@ 2> $@.got; then false; fi - @diff -u $@.want $@.got + --exists $@ 2> ${.OBJDIR}/$@.got; then false; fi + @diff -u ${.OBJDIR}/$@.want ${.OBJDIR}/$@.got # Checks for various printing features print-provides: # Test --print-provides - @echo "print-provides = 0.0.0" > $@.want + @echo "print-provides = 0.0.0" > ${.OBJDIR}/$@.want @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ pkg-config \ - --print-provides $@ > $@.got - @diff -u $@.want $@.got + --print-provides $@ > ${.OBJDIR}/$@.got + @diff -u ${.OBJDIR}/$@.want ${.OBJDIR}/$@.got print-req: # Test --print-requires - @echo "print-req2>=0.0.1" > $@.want + @echo "print-req2>=0.0.1" > ${.OBJDIR}/$@.want @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ pkg-config \ --print-requires $@ > $@.got - @diff -u $@.want $@.got + @diff -u ${.OBJDIR}/$@.want ${.OBJDIR}/$@.got print-req-priv: # Test --print-requires-private - @echo "print-req-priv2>=0.0.1" > $@.want + @echo "print-req-priv2>=0.0.1" > ${.OBJDIR}/$@.want @if PKG_CONFIG_PATH=${.CURDIR}/pcdir/ pkg-config \ - --print-requires-private $@ > $@.got; then false; fi - @diff -u $@.want $@.got + --print-requires-private $@ > ${.OBJDIR}/$@.got; then false; fi + @diff -u ${.OBJDIR}/$@.want ${.OBJDIR}/$@.got # Tests for version comparison cmp-vers1: @@ -71,24 +71,24 @@ builddir: logfile: # Test PKG_CONFIG_LOG - @echo "[/usr/bin/pkg-config] [--exists] [sysroot >= 0.0.0]" > $@.want - @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ PKG_CONFIG_LOG=$@.got \ + @echo "[/usr/bin/pkg-config] [--exists] [sysroot >= 0.0.0]" > ${.OBJDIR}/$@.want + @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ PKG_CONFIG_LOG=${.OBJDIR}/$@.got \ pkg-config --exists "sysroot >= 0.0.0" - @diff -u $@.want $@.got + @diff -u ${.OBJDIR}/$@.want ${.OBJDIR}/$@.got sysroot-cflags: # Test PKG_CONFIG_SYSROOT_DIR (cflags) - @echo "-I/altroot/tmp/include -I/altroot/tmp/include/foo" > $@.want + @echo "-I/altroot/tmp/include -I/altroot/tmp/include/foo" > ${.OBJDIR}/$@.want @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ PKG_CONFIG_SYSROOT_DIR=/altroot \ - pkg-config --cflags sysroot > $@.got - @diff -u $@.want $@.got + pkg-config --cflags sysroot > ${.OBJDIR}/$@.got + @diff -u ${.OBJDIR}/$@.want ${.OBJDIR}/$@.got sysroot-libs: # Test PKG_CONFIG_SYSROOT_DIR (libs) - @echo "-L/altroot/tmp/lib -L/altroot/tmp/lib/foo -lc" > $@.want + @echo "-L/altroot/tmp/lib -L/altroot/tmp/lib/foo -lc" > ${.OBJDIR}/$@.want @PKG_CONFIG_PATH=${.CURDIR}/pcdir/ PKG_CONFIG_SYSROOT_DIR=/altroot \ - pkg-config --libs sysroot > $@.got - @diff -u $@.want $@.got + pkg-config --libs sysroot > ${.OBJDIR}/$@.got + @diff -u ${.OBJDIR}/$@.want ${.OBJDIR}/$@.got # Misc. tests define-variable: |