- prefix/libdir handling is broken in the Makefile chains

This commit is contained in:
Dan Horák 2010-09-29 11:23:07 +02:00
parent 8997b5e862
commit bf1f8be3ba
1 changed files with 7 additions and 2 deletions

View File

@ -4,7 +4,7 @@
Name: stfl
Version: 0.21
Release: 11%{?dist}
Release: 12%{?dist}
Summary: The Structured Terminal Forms Language/Library
Group: System Environment/Libraries
@ -86,6 +86,8 @@ sed -i.ldflags -e 's|\(-shared\)|\1 \$(LDLIBS)|' Makefile
## - http://www.rocklinux.net/pipermail/stfl/2009-October/000118.html
sed -i.path -e 's|libdir=.*|libdir=%{_libdir}|' stfl.pc.in
sed -i.cflags -e 's|-Os||' Makefile
# fix paths in Makefile.cfg
sed -i.path -e 's|lib$|%{_lib}|' -e 's|/usr/local$|%{_prefix}|' Makefile.cfg
%build
# building with smp flags causes random failures
@ -97,7 +99,7 @@ echo `ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] '`
%install
rm -rf %{buildroot}
make install prefix=%{_prefix} libdir=%{_lib} DESTDIR=%{buildroot}
make install DESTDIR=%{buildroot}
# give the shared libraries executable permissions so they get stripped
# also fixes the 0555 permissions on the perl bindings
find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
@ -147,6 +149,9 @@ rm -rf %{buildroot}
%{ruby_sitearch}/stfl.so
%changelog
* Wed Sep 29 2010 Dan Horák <dan[at]danny.cz> 0.21-12
- prefix/libdir handling is broken in the Makefile chains
* Tue Sep 07 2010 thomas Janssen <thomasj@fedoraproject.org 0.21-11
- find out what FTBFS