[scl-utils] More macrosdir adaptations

Ville Skyttä scop at fedoraproject.org
Wed Mar 4 20:24:33 UTC 2015


commit b5f70fba759abcbc03583f7772f638eaeb5446e4
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Mar 4 22:24:26 2015 +0200

    More macrosdir adaptations

 scl-utils.spec | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --git a/scl-utils.spec b/scl-utils.spec
index 29b1dc1..8142340 100644
--- a/scl-utils.spec
+++ b/scl-utils.spec
@@ -38,6 +38,11 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
+if [ %{macrosdir} != %{_sysconfdir}/rpm ]; then
+    mkdir -p %{buildroot}%{macrosdir}
+    mv %{buildroot}%{_sysconfdir}/rpm/macros.scl %{buildroot}%{macrosdir}
+    rmdir %{buildroot}%{_sysconfdir}/rpm
+fi
 cat %SOURCE1 >> %{buildroot}%{macrosdir}/macros.scl
 mkdir -p %{buildroot}%{_sysconfdir}/scl
 cd %{buildroot}%{_sysconfdir}/scl


More information about the scm-commits mailing list