From 68460c09bb795bb7141a20c2b59db38049b1cf6e Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Fri, 31 Jul 2020 15:33:21 +0200 Subject: [PATCH] Use make macros Based on https://src.fedoraproject.org/rpms/openssh/pull-request/11 https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- openssh.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openssh.spec b/openssh.spec index 8305940..429c175 100644 --- a/openssh.spec +++ b/openssh.spec @@ -509,7 +509,7 @@ fi perl -pi -e "s|-lcrypto|%{_libdir}/libcrypto.a|g" Makefile %endif -make +%make_build # Define a variable to toggle gnome1/gtk2 building. This is necessary # because RPM doesn't handle nested %%if statements. @@ -540,7 +540,7 @@ LDFLAGS="$SAVE_LDFLAGS" --libexecdir=/%{_libdir}/security \ --with-mantype=man \ --without-openssl-header-check `# The check is broken` -make +%make_build popd %endif @@ -557,7 +557,7 @@ mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh/ssh_config.d mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/ssh/sshd_config.d mkdir -p -m755 $RPM_BUILD_ROOT%{_libexecdir}/openssh mkdir -p -m755 $RPM_BUILD_ROOT%{_var}/empty/sshd -make install DESTDIR=$RPM_BUILD_ROOT +%make_install rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ssh/ldap.conf install -d $RPM_BUILD_ROOT/etc/pam.d/ @@ -598,7 +598,7 @@ perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_mandir}/man*/* %if %{pam_ssh_agent} pushd pam_ssh_agent_auth-%{pam_ssh_agent_ver} -make install DESTDIR=$RPM_BUILD_ROOT +%make_install popd %endif %pre