From dc6fb0137483b5dcc270e49ad111e154b61d98dc Mon Sep 17 00:00:00 2001
From: Pere Mato <pere.mato@cern.ch>
Date: Tue, 28 Oct 2014 10:12:03 +0100
Subject: [PATCH] Unify the name for allLinkDefs.h and install the complete
directory etc/dictpch
---
CMakeLists.txt | 5 +----
build/unix/makepchinput.sh | 2 +-
etc/dictpch/makepch.sh | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a19a761b60..43cd338c273 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,10 +134,7 @@ add_custom_target(onepcm ALL DEPENDS etc/allDict.cxx.pch)
set_source_files_properties(${__allFiles} PROPERTIES GENERATED TRUE)
add_dependencies(onepcm ${__allTargets})
install(FILES ${CMAKE_BINARY_DIR}/etc/allDict.cxx.pch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
-install(FILES ${CMAKE_BINARY_DIR}/etc/dictpch/allLinkDefs.h
- ${CMAKE_BINARY_DIR}/etc/dictpch/allHeaders.h
- ${CMAKE_BINARY_DIR}/etc/dictpch/allCppflags.txt
- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dictpch)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/etc/dictpch DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
#---hsimple.root---------(use the executable for clearer dependencies and proper return code)---
if(NOT gnuinstall) # TODO hsimple.root for gnuinstall
diff --git a/build/unix/makepchinput.sh b/build/unix/makepchinput.sh
index 1b787e59fdf..60332328823 100755
--- a/build/unix/makepchinput.sh
+++ b/build/unix/makepchinput.sh
@@ -17,7 +17,7 @@ rm -f include/allHeaders.h include/allHeaders.h.pch include/allLinkDef.h all.h c
outdir=etc/dictpch
allheaders=$outdir/allHeaders.h
-alllinkdefs=$outdir/allLinkdefs.h
+alllinkdefs=$outdir/allLinkDefs.h
cppflags=$outdir/allCppflags.txt
mkdir -p $outdir
diff --git a/etc/dictpch/makepch.sh b/etc/dictpch/makepch.sh
index 52bff10c984..1e922a282b1 100755
--- a/etc/dictpch/makepch.sh
+++ b/etc/dictpch/makepch.sh
@@ -16,7 +16,7 @@
rootdir=.
cfgdir=etc/dictpch
allheaders=$cfgdir/allHeaders.h
-alllinkdefs=$cfgdir/allLinkdefs.h
+alllinkdefs=$cfgdir/allLinkDefs.h
cppflags=$cfgdir/allCppflags.txt
pch=$1
shift
--
GitLab