diff --git a/lua.spec b/lua.spec index 0644c9f..eb9632d 100644 --- a/lua.spec +++ b/lua.spec @@ -159,25 +159,6 @@ LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir}/lua -e"_U= %install %make_install -rm $RPM_BUILD_ROOT%{_libdir}/*.la -mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/%{major_version} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version} - -# Rename luaconf.h to luaconf-.h to avoid file conflicts on -# multilib systems and install luaconf.h wrapper -mv %{buildroot}%{_includedir}/luaconf.h %{buildroot}%{_includedir}/luaconf-%{_arch}.h -install -p -m 644 %{SOURCE4} %{buildroot}%{_includedir}/luaconf.h - -%if 0%{?bootstrap} -pushd lua-%{bootstrap_version} -mkdir $RPM_BUILD_ROOT/installdir -make install DESTDIR=$RPM_BUILD_ROOT/installdir -cp -a $RPM_BUILD_ROOT/installdir/%{_libdir}/liblua-%{bootstrap_major_version}.so $RPM_BUILD_ROOT%{_libdir}/ -mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/%{bootstrap_major_version} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{bootstrap_major_version} -rm -rf $RPM_BUILD_ROOT/installdir -popd -%endif cat << 'EOF' > %{buildroot}%{_libdir}/pkgconfig/lua.pc major_ver=%{major_version} @@ -200,6 +181,26 @@ Libs: -llua -lm -ldl Cflags: -I${includedir} EOF +rm $RPM_BUILD_ROOT%{_libdir}/*.la +mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/%{major_version} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version} + +# Rename luaconf.h to luaconf-.h to avoid file conflicts on +# multilib systems and install luaconf.h wrapper +mv %{buildroot}%{_includedir}/luaconf.h %{buildroot}%{_includedir}/luaconf-%{_arch}.h +install -p -m 644 %{SOURCE4} %{buildroot}%{_includedir}/luaconf.h + +%if 0%{?bootstrap} +pushd lua-%{bootstrap_version} +mkdir $RPM_BUILD_ROOT/installdir +make install DESTDIR=$RPM_BUILD_ROOT/installdir +cp -a $RPM_BUILD_ROOT/installdir/%{_libdir}/liblua-%{bootstrap_major_version}.so $RPM_BUILD_ROOT%{_libdir}/ +mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/%{bootstrap_major_version} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{bootstrap_major_version} +rm -rf $RPM_BUILD_ROOT/installdir +popd +%endif + %files %{!?_licensedir:%global license %%doc} %license mit.txt