From 131a187a02ddbba906ad6b9f5f45293809e6f5d3 Mon Sep 17 00:00:00 2001 From: bluhm Date: Mon, 10 Jul 2017 18:48:37 +0000 Subject: [PATCH] The libtool regress used PROGS as a regular variable. Rename it to avoid the new special meaning in bsd.prog.mk. --- regress/usr.bin/libtool/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/regress/usr.bin/libtool/Makefile b/regress/usr.bin/libtool/Makefile index 8a2cb5c296d..9237fd59382 100644 --- a/regress/usr.bin/libtool/Makefile +++ b/regress/usr.bin/libtool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2017/07/07 10:56:13 bluhm Exp $ +# $OpenBSD: Makefile,v 1.35 2017/07/10 18:48:37 bluhm Exp $ REGRESS_TARGETS = test-compile-0 test-link-0 test-install-0 \ test-run-0 test-link-1 test-install-1 test-run-1 \ test-link-2 test-link-3 test-link-4 \ @@ -281,7 +281,7 @@ ${DEST}/bin/p2: ${DEST}/lib/liba0.la ${DEST}/lib/liba1.la SOPTS = -version-info 0:0:0 -rpath /usr/local/lib LIBS = a a0 a1 a2 a3 a4 bad a9 ${WEIRD} -PROGS = p1 p2 +PRGS = p1 p2 OBJ_a = a.lo b.lo a_OPTS = ${SOPTS} @@ -326,12 +326,12 @@ LINK_p2 = c.lo -la1 .c.lo: ${LIBTOOL} --mode=compile ${CC} -c ${CFLAGS} ${.CURDIR}/$*.c -.for p in ${PROGS} +.for p in ${PRGS} $p: ${OBJ_$p} ${LIBTOOL} --mode=link ${CC} ${CFLAGS} -o $@ ${LINK_$p} .endfor -.for t in ${PROGS} +.for t in ${PRGS} ${DEST}/bin/$t: $t mkdir -p ${DEST}/bin ${LIBTOOL} --mode=install cp $t ${DEST}/bin/$t @@ -348,7 +348,7 @@ lib$l.la: ${OBJ_$l} ${LIBS_ENV} ${LIBTOOL} --mode=link ${CC} ${CFLAGS} -o $@ ${$l_OPTS} ${OBJ_$l} .endfor -CLEANFILES += ${PROGS} s1 *.c *.o *.lo *.la .libs/* lib1/* out* +CLEANFILES += ${PRGS} s1 *.c *.o *.lo *.la .libs/* lib1/* out* CLEANFILES += ${DEST}/bin/* ${DEST}/lib/* ${DEST2}/lib/* ${DEST3}/lib/* .PHONY: ${REGRESS_TARGETS} regress compile-tests -- 2.20.1