[cpp-linbuild] 10/15: Adopt %make_install

[John W. O'Brien]

This is an automated email from the git hooks/post-receive script.

obrienjw pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=96f4aee189a9197b518a606f302e5d8aca2f7493

commit 96f4aee189a9197b518a606f302e5d8aca2f7493
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Jun 16 13:55:09 2023 +0000

    Adopt %make_install
---
 common/SPECS/curl-openssl.spec           | 2 +-
 common/SPECS/log4shib.spec               | 2 +-
 common/SPECS/opensaml.spec               | 2 +-
 common/SPECS/shibboleth-embedded-ds.spec | 2 +-
 common/SPECS/shibboleth.spec             | 2 +-
 common/SPECS/shibresolver.spec           | 2 +-
 common/SPECS/xerces-c.spec               | 2 +-
 common/SPECS/xml-security-c.spec         | 2 +-
 common/SPECS/xmltooling.spec             | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/SPECS/curl-openssl.spec b/common/SPECS/curl-openssl.spec
index 4321526..a5d90d0 100644
--- a/common/SPECS/curl-openssl.spec
+++ b/common/SPECS/curl-openssl.spec
@@ -87,7 +87,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" install
+%make_install
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 
diff --git a/common/SPECS/log4shib.spec b/common/SPECS/log4shib.spec
index 89d20b9..3d4c861 100644
--- a/common/SPECS/log4shib.spec
+++ b/common/SPECS/log4shib.spec
@@ -60,7 +60,7 @@ The static libraries and header files needed for development with log4shib.
 %{__make}
 
 %install
-%{__make} DESTDIR=$RPM_BUILD_ROOT apidir=$RPM_BUILD_ROOT%{pkgdocdir}/api install
+%make_install apidir=$RPM_BUILD_ROOT%{pkgdocdir}/api
 # If we use %%doc down below to package the README files from the build tree,
 # it will blow away the package's docdir folder, and the installed API docs with it.
 # Instead, copy the README files manually into the platform's docdir.
diff --git a/common/SPECS/opensaml.spec b/common/SPECS/opensaml.spec
index 3a85b68..a65a956 100644
--- a/common/SPECS/opensaml.spec
+++ b/common/SPECS/opensaml.spec
@@ -101,7 +101,7 @@ This package includes XML schemas and related files.
 %{__make}
 
 %install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
+%make_install pkgdocdir=%{pkgdocdir}
 # Don't package unit tester if present.
 %{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/samltest
 
diff --git a/common/SPECS/shibboleth-embedded-ds.spec b/common/SPECS/shibboleth-embedded-ds.spec
index bbf04f9..c7ec2fd 100644
--- a/common/SPECS/shibboleth-embedded-ds.spec
+++ b/common/SPECS/shibboleth-embedded-ds.spec
@@ -28,7 +28,7 @@ single sign-on implementations such as Shibboleth.
 
 
 %install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 # Plug the DS into the built-in Apache on a recognized system.
 touch rpm.filelist
diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index b9b6170..4af662b 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -145,7 +145,7 @@ This package includes files needed for development with Shibboleth.
 %{__make} pkgdocdir=%{pkgdocdir}
 
 %install
-%{__make} install NOKEYGEN=1 DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
+%make_install NOKEYGEN=1 pkgdocdir=%{pkgdocdir}
 
 %if "%{_vendor}" == "suse"
     %{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
diff --git a/common/SPECS/shibresolver.spec b/common/SPECS/shibresolver.spec
index 646162f..49c2616 100644
--- a/common/SPECS/shibresolver.spec
+++ b/common/SPECS/shibresolver.spec
@@ -95,7 +95,7 @@ This package includes files needed for development.
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
+%make_install pkgdocdir=%{pkgdocdir}
 
 %check
 %{__make} check
diff --git a/common/SPECS/xerces-c.spec b/common/SPECS/xerces-c.spec
index b261234..0dc1c35 100644
--- a/common/SPECS/xerces-c.spec
+++ b/common/SPECS/xerces-c.spec
@@ -72,7 +72,7 @@ The static libraries and header files needed for development with Xerces-C++.
 %{__make}
 
 %install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
diff --git a/common/SPECS/xml-security-c.spec b/common/SPECS/xml-security-c.spec
index 0009f88..4f49ed8 100644
--- a/common/SPECS/xml-security-c.spec
+++ b/common/SPECS/xml-security-c.spec
@@ -74,7 +74,7 @@ This package includes files needed for development with xml-security-c.
 %{__make}
 
 %install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
diff --git a/common/SPECS/xmltooling.spec b/common/SPECS/xmltooling.spec
index 9652fd0..11e13e8 100644
--- a/common/SPECS/xmltooling.spec
+++ b/common/SPECS/xmltooling.spec
@@ -120,7 +120,7 @@ This package includes XML schemas and related files.
 %{__make}
 
 %install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
+%make_install pkgdocdir=%{pkgdocdir}
 # Don't package unit tester if present.
 %{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/xmltoolingtest
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.