Fix benchmarklib

benchmarklib/Makefile

@@ -11,15 +11,14 @@ impl:
 	# if [[ -f CMakeCache.txt ]]; then rm CMakeCache.txt; fi
 	dpkg -i boost/pkg/*.deb
 	pushd benchmarklib && \
-	CXX=$$(which c++) cmake -DSTATIC=1 -DBOOST_ROOT=/opt/cppse/build/boost . && \
+	CXX=$$(which c++) cmake -DSTATIC=1 -DBOOST_ROOT=/opt/cppse/build/boost -DCMAKE_INSTALL_PREFIX=$$PWD/benchmarklib_out . && \
 	make -j $$(nproc) && \
 	make install
 
 package:
 	rm -rf out
-	mkdir -p out/opt/cppse/build/benchmarklib/{include,lib}
-	cp -prv /usr/local/lib/libbenchmarklib.a out/opt/cppse/build/benchmarklib/lib/
-	cp -prv /usr/local/include/benchmark.h  out/opt/cppse/build/benchmarklib/include/
+	mkdir -p out/opt/cppse/build/benchmarklib
+	cp -prv ./benchmarklib/benchmarklib_out/* out/opt/cppse/build/benchmarklib/
 	rm -rf benchmarklib_1.0_amd64.deb
 	docker run -v "$$(pwd):/src/" rayburgemeestre/fpm-ubuntu:18.04 fpm -s dir -t deb -n benchmarklib --license MPL2 --maintainer "Ray Burgemeestre <ray@cppse.nl>" --description "benchmarklib - build dependency" --url "https://bitbucket.org/rayburgemeestre/benchmarklib" --deb-generate-changes -C /src/out