summaryrefslogtreecommitdiffstats
path: root/scl-utils-layout.patch
diff options
context:
space:
mode:
Diffstat (limited to 'scl-utils-layout.patch')
-rw-r--r--scl-utils-layout.patch19
1 files changed, 9 insertions, 10 deletions
diff --git a/scl-utils-layout.patch b/scl-utils-layout.patch
index 475fefa..c164f98 100644
--- a/scl-utils-layout.patch
+++ b/scl-utils-layout.patch
@@ -1,18 +1,17 @@
diff -up rpm/macros.scl.orig rpm/macros.scl
---- rpm/macros.scl.orig 2015-06-24 06:50:17.000000000 +0200
-+++ rpm/macros.scl 2015-06-24 06:50:22.000000000 +0200
-@@ -68,11 +68,11 @@ package or when debugging this package.
- %global _libexecdir %{_exec_prefix}/libexec
+--- rpm/macros.scl.orig 2015-06-24 07:26:39.838044392 +0200
++++ rpm/macros.scl 2015-06-24 07:34:13.762968582 +0200
+@@ -69,10 +69,13 @@ package or when debugging this package.
%global _datadir %{_prefix}/share
%global _sysconfdir %{_scl_root}/etc
--%{?nfsmountable: %global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/scls/%{scl}}
-+%{?nfsmountable: %global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/%{scl}}
+ %{?nfsmountable: %global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/scls/%{scl}}
++%{?rh_layout: %global _sysconfdir %{_root_sysconfdir}%{_scl_prefix}/%{scl}}
%global _sharedstatedir %{_scl_root}/var/lib
--%{?nfsmountable: %global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}/lib}
-+%{?nfsmountable: %global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}/lib}
+ %{?nfsmountable: %global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}/lib}
++%{?rh_layout: %global _sharedstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}/lib}
%global _localstatedir %{_scl_root}/var
--%{?nfsmountable: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}}
-+%{?nfsmountable: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}}
+ %{?nfsmountable: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/scls/%{scl}}
++%{?rh_layout: %global _localstatedir %{_root_localstatedir}%{_scl_prefix}/%{scl}}
%global _libdir %{_exec_prefix}/%{_lib}
%global _includedir %{_prefix}/include
%global _infodir %{_datadir}/info