Revert nonsensical changes.

2 files changed, 15 insertions, 15 deletions

diff --git a/parallel/slurm/Makefile b/parallel/slurm/Makefile
index 2f1cbda0bf0..9025cc65786 100644
--- a/parallel/slurm/Makefile
+++ b/parallel/slurm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/12/17 13:41:57 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2016/12/19 15:47:09 asau Exp $
 
 DISTNAME=	slurm-2.6.4
 PKGREVISION=	9
@@ -20,7 +20,7 @@ USE_LIBTOOL=	yes
 
 CONFIGURE_ARGS+=	--with-hdf5=no
 # Fix installation:
-CONFIGURE_ARGS+=	--htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html
+CONFIGURE_ARGS+=	--htmldir=$(PREFIX)/share/doc/$(PKGNAME_NOREV)/html
 
 REPLACE_PYTHON=	doc/html/shtml2html.py
 
@@ -28,18 +28,18 @@ PKG_GROUPS=		slurm
 PKG_USERS=		slurm:slurm
 
 PKG_GECOS.slurm=	SLURM user
-PKG_SHELL.slurm=	${NOLOGIN}
+PKG_SHELL.slurm=	$(NOLOGIN)
 
 RCD_SCRIPTS+=	slurmd slurmctld
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/etc/* ${DESTDIR}${PREFIX}/share/examples/${PKGBASE}/
+	$(INSTALL_DATA_DIR) $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE)
+	$(INSTALL_DATA) $(WRKSRC)/etc/* $(DESTDIR)$(PREFIX)/share/examples/$(PKGBASE)/
 
 PYTHON_FOR_BUILD_ONLY=	yes
 .include "../../lang/python/tool.mk"
 
-CONFIGURE_ARGS+=	--with-munge=${BUILDLINK_PREFIX.munge:Q}
+CONFIGURE_ARGS+=	--with-munge=$(BUILDLINK_PREFIX.munge:Q)
 .include "../../security/munge/buildlink3.mk" # optional
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/parallel/threadingbuildingblocks/Makefile b/parallel/threadingbuildingblocks/Makefile
index a2e1fc417b5..6ce91e22f69 100644
--- a/parallel/threadingbuildingblocks/Makefile
+++ b/parallel/threadingbuildingblocks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/12/17 13:43:13 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2016/12/19 15:44:44 asau Exp $
 
 DISTNAME=	tbb30_20110325oss_src
 PKGNAME=	threadingbuildingblocks-3.0.6 # for "3.0 update 6"
@@ -10,7 +10,7 @@ MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://www.threadingbuildingblocks.org/
 COMMENT=	Threading Buildling Blocks
 
-WRKSRC=		${WRKDIR}/${DISTNAME:_src=} #tbb30_20101215oss
+WRKSRC=		$(WRKDIR)/$(DISTNAME:_src=) #tbb30_20101215oss
 
 USE_LANGUAGES=	c c++
 USE_TOOLS=	gmake pax
@@ -19,16 +19,16 @@ BUILD_TARGET=	default
 TEST_TARGET=	test
 
 pre-configure:
-	cd ${WRKSRC}/build/ && cp FreeBSD.gcc.inc NetBSD.gcc.inc && cp FreeBSD.inc NetBSD.inc
+	cd $(WRKSRC)/build/ && cp FreeBSD.gcc.inc NetBSD.gcc.inc && cp FreeBSD.inc NetBSD.inc
 
-INSTALLATION_DIRS=	include lib share/doc/${PKGBASE}
+INSTALLATION_DIRS=	include lib share/doc/$(PKGBASE)
 
 do-install:
-	${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbb.so ${DESTDIR}${PREFIX}/lib/
-	${INSTALL_LIB} ${WRKSRC}/build/build_release/libtbbmalloc.so ${DESTDIR}${PREFIX}/lib/
-	${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbb_debug.so ${DESTDIR}${PREFIX}/lib/
-	${INSTALL_LIB} ${WRKSRC}/build/build_debug/libtbbmalloc_debug.so ${DESTDIR}${PREFIX}/lib/
-	(cd ${WRKSRC}/include && pax -rw tbb ${DESTDIR}${PREFIX}/include/)
+	$(INSTALL_LIB) $(WRKSRC)/build/build_release/libtbb.so $(DESTDIR)$(PREFIX)/lib/
+	$(INSTALL_LIB) $(WRKSRC)/build/build_release/libtbbmalloc.so $(DESTDIR)$(PREFIX)/lib/
+	$(INSTALL_LIB) $(WRKSRC)/build/build_debug/libtbb_debug.so $(DESTDIR)$(PREFIX)/lib/
+	$(INSTALL_LIB) $(WRKSRC)/build/build_debug/libtbbmalloc_debug.so $(DESTDIR)$(PREFIX)/lib/
+	(cd $(WRKSRC)/include && pax -rw tbb $(DESTDIR)$(PREFIX)/include/)
 # documentation:
 #	(cd $(WRKSRC)/doc/html && pax -rw . $(DESTDIR)$(PREFIX)/share/doc/html/$(PKGBASE)/)
 #	$(INSTALL_DATA) $(WRKSRC)/doc/Release_Notes.txt $(DESTDIR)$(PREFIX)/share/doc/$(PKGBASE)/