From 0334cfdf4035735f3a58bc1865d88a6648e4e97b Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sat, 26 Sep 2020 15:37:19 +0200 Subject: [PATCH] - fix builddir path --- php.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/php.spec b/php.spec index 4839f0a..46579dd 100644 --- a/php.spec +++ b/php.spec @@ -2481,7 +2481,7 @@ install -d $RPM_BUILD_ROOT{%{_libdir}/{php,apache{,1}},%{_sysconfdir}/{apache,cg cp -pf php_config.h.cli main/php_config.h cp -pf Makefile.cli Makefile %{__make} install \ - phpbuilddir=%{_libdir}/%{name}/build \ + phpbuilddir=%{_libdir}/php/php%{php_suffix}/build \ INSTALL_ROOT=$RPM_BUILD_ROOT # version the .phar files @@ -2606,17 +2606,17 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/{cgi-fcgi,cli,apache,apache2handler}.d %{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/{conf.d/readline.ini,cli.d} # use system automake and {lib,sh}tool -ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/%{name}/build -ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/%{name}/build +ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build +ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build for fn in libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4; do f=%{_aclocaldir}/$fn test -f $f || continue - ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build + ln -snf $f $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build done for fn in ltmain.sh config/ltmain.sh build-aux/ltmain.sh; do f=/usr/share/libtool/$fn test -f $f || continue - ln -snf $f $RPM_BUILD_ROOT%{_libdir}/%{name}/build + ln -snf $f $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build break done sed -i -e '/^phpdir/ s,/php/build,/%{name}/build,' $RPM_BUILD_ROOT%{_bindir}/phpize%{php_suffix} @@ -2633,7 +2633,7 @@ cp -a tests/* $RPM_BUILD_ROOT%{php_datadir}/tests/php # fix install paths, avoid evil rpaths sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common%{php_suffix}.la # better solution? -sed -i -e 's|libphp_common.la|$(libdir)/libphp_common%{php_suffix}.la|' $RPM_BUILD_ROOT%{_libdir}/%{name}/build/acinclude.m4 +sed -i -e 's|libphp_common.la|$(libdir)/libphp_common%{php_suffix}.la|' $RPM_BUILD_ROOT%{_libdir}/php/php%{php_suffix}/build/acinclude.m4 %clean rm -rf $RPM_BUILD_ROOT @@ -2945,7 +2945,7 @@ fi %attr(755,root,root) %{_libdir}/libphp_common%{php_suffix}.so %{_libdir}/libphp_common%{php_suffix}.la %{_includedir}/php/php%{php_suffix} -%{_libdir}/%{name}/build +%{_libdir}/php/php%{php_suffix}/build %{_mandir}/man1/php-config%{php_suffix}.1* %ghost %{_mandir}/man1/php-config.1* %{_mandir}/man1/phpize%{php_suffix}.1* -- 2.46.0