Accepting request 716307 from home:cgiboudeaux:test

Fix installation if kf5_makeinstall is used without parameter.

even with 'popd &>/dev/null', the build fails if kf5_makeinstall is used without '-C <somedir>'

OBS-URL: https://build.opensuse.org/request/show/716307
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kf5-filesystem?expand=0&rev=74
This commit is contained in:
Luca Beltrame 2019-07-18 13:58:15 +00:00 committed by Git OBS Bridge
parent 22ca655736
commit b8c16046f4
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 18 11:27:05 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
- Fix installation if kf5_makeinstall is used without parameter.
-------------------------------------------------------------------
Wed Jul 17 10:58:52 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>

View File

@ -41,10 +41,12 @@
%_kf5_build_type None
%kf5_makeinstall(C:) \
bdir=. \
%{-C:dir=%{-C*} \
pushd $dir} \
cd $dir \
bdir=.. } \
make VERBOSE=1 DESTDIR=%{?buildroot:%{buildroot}} install \
popd &>/dev/null \
cd $bdir \
if ls %{buildroot}%{_kf5_configdir}/*.*categories 2>/dev/null; then \
echo "Please ask upstream to use the new KDE_INSTALL_LOGGINGCATEGORIESDIR variable." \
mkdir -p %{buildroot}%{_kf5_debugdir} \