consolidate etc folder

3 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0620a1ed21b..2a103f36cc11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = root
 	pkgdesc = C++ data analysis framework and interpreter from CERN.
 	pkgver = 6.12.04
-	pkgrel = 1
+	pkgrel = 2
 	url = http://root.cern.ch
 	install = root.install
 	arch = i686
@@ -49,7 +49,7 @@ pkgbase = root
 	sha256sums = 9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7
 	sha256sums = 50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0
 	sha256sums = 3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a
-	sha256sums = a8db29f6acf32659daca8de35481b25ed847b2182e6033940f3568f3d1ad22fb
+	sha256sums = 386a62013e10130b6d0fffcee3ea31abf9e125a14e38a513eb8142fec6bf4410
 
 pkgname = root
 
diff --git a/PKGBUILD b/PKGBUILD
index b480dd5f0e45..9b01cd0907f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=root
 pkgver=6.12.04
-pkgrel=1
+pkgrel=2
 pkgdesc='C++ data analysis framework and interpreter from CERN.'
 arch=('i686' 'x86_64')
 url='http://root.cern.ch'
@@ -54,7 +54,7 @@ sha256sums=('f438f2ae6e25496fa81df525935fb0bf2a403855d95c40b3e0f3a3e1e861a085'
             '9d1f8e7ad923cb5450386edbbce085d258653c0160419cdd6ff154542cc32bd7'
             '50c08191a5b281a39aa05ace4feb8d5405707b4c54a5dcba061f954649c38cb0'
             '3c45b03761d5254142710b7004af0077f18efece7c95511910140d0542c8de8a'
-            'a8db29f6acf32659daca8de35481b25ed847b2182e6033940f3568f3d1ad22fb')
+            '386a62013e10130b6d0fffcee3ea31abf9e125a14e38a513eb8142fec6bf4410')
 prepare() {
     cd "${pkgname}-${pkgver}"
 
@@ -91,6 +91,7 @@ package() {
 
     install -D -m644 "${srcdir}/${pkgname}-${pkgver}/build/package/debian/root-system-bin.desktop.in" \
         "${pkgdir}/usr/share/applications/root-system-bin.desktop"
+
     # replace @prefix@ with /usr for the desktop
     sed -e 's_@prefix@_/usr_' -i "${pkgdir}/usr/share/applications/root-system-bin.desktop"
 
diff --git a/settings.cmake b/settings.cmake
index c7a908d99092..122e1bd3b43a 100644
--- a/settings.cmake
+++ b/settings.cmake
@@ -1,7 +1,7 @@
 set (CMAKE_BUILD_TYPE Release CACHE STRING "" FORCE)
 set (BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)  # this option is currently incompatible
 set (CMAKE_INSTALL_PREFIX /usr CACHE PATH "" FORCE)
-set (CMAKE_INSTALL_SYSCONFDIR /etc CACHE PATH "" FORCE)
+set (CMAKE_INSTALL_SYSCONFDIR /etc/root CACHE PATH "" FORCE)
 set (CMAKE_INSTALL_DATAROOTDIR /usr/share CACHE PATH "" FORCE)
 set (LLVM_ENABLE_THREADS ON CACHE BOOL "" FORCE)  # try to workaround pthread issue
 set (asimage ON CACHE BOOL "" FORCE)