[packages/libCSS] do not overwrite cflags
glen
glen at pld-linux.org
Sat Apr 27 15:51:53 CEST 2013
commit fb7c594b218d388f8b21832fcc7a1f3fe777d3c0
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Apr 27 16:51:44 2013 +0300
do not overwrite cflags
libCSS.spec | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/libCSS.spec b/libCSS.spec
index bb3eacd..8607357 100644
--- a/libCSS.spec
+++ b/libCSS.spec
@@ -67,23 +67,29 @@ Statyczna biblioteka libCSS.
%patch0 -p1
%build
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-shared Q='' \
- CFLAGS="%{rpmcflags} -Iinclude -Isrc" LDFLAGS="%{rpmldflags}"
+export CFLAGS="%{rpmcflags}"
+export LDFLAGS="%{rpmldflags}"
+
+%{__make} Q= \
+ PREFIX=%{_prefix} \
+ COMPONENT_TYPE=lib-shared
+
%if %{with static_libs}
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-static Q='' \
- CFLAGS="%{rpmcflags} -Iinclude -Isrc" LDFLAGS="%{rpmldflags}"
+%{__make} Q= \
+ PREFIX=%{_prefix} \
+ COMPONENT_TYPE=lib-static
%endif
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -j1 install Q='' \
+%{__make} -j1 install Q= \
lib=%{_lib} \
PREFIX=%{_prefix} \
COMPONENT_TYPE=lib-shared \
DESTDIR=$RPM_BUILD_ROOT
%if %{with static_libs}
-%{__make} -j1 install Q='' \
+%{__make} -j1 install Q= \
lib=%{_lib} \
PREFIX=%{_prefix} \
COMPONENT_TYPE=lib-static \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libCSS.git/commitdiff/fb7c594b218d388f8b21832fcc7a1f3fe777d3c0
More information about the pld-cvs-commit
mailing list