From 3eafb2b5c486ca7c53249f3d79c97769fef70162 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Thu, 25 Sep 2014 18:50:48 +0200 Subject: [PATCH] Makefile: Fix DESTDIR handling --- Makefile | 4 ++-- tools/dmake.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b9c9317b7..cd3a6f1f6 100644 --- a/Makefile +++ b/Makefile @@ -272,8 +272,8 @@ install: cppcheck install cppcheck ${BIN} install htmlreport/cppcheck-htmlreport ${BIN} ifdef CFGDIR - install -d ${CFGDIR} - install -m 644 cfg/* ${CFGDIR} + install -d ${DESTDIR}${CFGDIR} + install -m 644 cfg/* ${DESTDIR}${CFGDIR} endif diff --git a/tools/dmake.cpp b/tools/dmake.cpp index bedb5baf4..981391c3e 100644 --- a/tools/dmake.cpp +++ b/tools/dmake.cpp @@ -415,8 +415,8 @@ int main(int argc, char **argv) fout << "\tinstall cppcheck ${BIN}\n"; fout << "\tinstall htmlreport/cppcheck-htmlreport ${BIN}\n"; fout << "ifdef CFGDIR \n"; - fout << "\tinstall -d ${CFGDIR}\n"; - fout << "\tinstall -m 644 cfg/* ${CFGDIR}\n"; + fout << "\tinstall -d ${DESTDIR}${CFGDIR}\n"; + fout << "\tinstall -m 644 cfg/* ${DESTDIR}${CFGDIR}\n"; fout << "endif\n\n"; fout << "\n###### Build\n\n";