CVS commit: pkgsrc/parallel/threadingbuildingblocks

["Aleksej Saushev" <asau%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   asau
Date:           Mon Dec 19 15:44:44 UTC 2016

Modified Files:
        pkgsrc/parallel/threadingbuildingblocks: Makefile

Log Message:
Revert nonsensical changes.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/parallel/threadingbuildingblocks/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/threadingbuildingblocks/Makefile
diff -u pkgsrc/parallel/threadingbuildingblocks/Makefile:1.5 pkgsrc/parallel/threadingbuildingblocks/Makefile:1.6
--- pkgsrc/parallel/threadingbuildingblocks/Makefile:1.5        Sat Dec 17 13:43:13 2016
+++ pkgsrc/parallel/threadingbuildingblocks/Makefile    Mon Dec 19 15:44:44 2016
@@ -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@localhost
 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)/