[packages/libdom] pass our CC, cleanup, fix bad copy-paste

glen glen at pld-linux.org
Sat Apr 27 16:08:30 CEST 2013


commit a9f7cd23ebcd8f8588e5ce77627abe08bd0cef56
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Apr 27 17:08:08 2013 +0300

    pass our CC, cleanup, fix bad copy-paste

 libdom.spec | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)
---
diff --git a/libdom.spec b/libdom.spec
index d0a8ef3..5754a1e 100644
--- a/libdom.spec
+++ b/libdom.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# don't build static library
-#
+
 Summary:	Implementation of W3C DOM
 Name:		libdom
 Version:	0.0.1
@@ -53,33 +53,32 @@ Statyczna biblioteka libdom.
 %setup -q
 
 %build
-CFLAGS="%{rpmcflags}"
-LDFLAGS="%{rpmldflags}"
-export CFLAGS
-export LDFLAGS
+export CC="%{__cc}"
+export CFLAGS="%{rpmcflags}"
+export LDFLAGS="%{rpmldflags}"
+
+%{__make} Q= \
+	PREFIX=%{_prefix} \
+	COMPONENT_TYPE=lib-shared
 
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-shared Q='' \
-	-Iinclude -Isrc"
 %if %{with static_libs}
-%{__make} PREFIX=%{_prefix} COMPONENT_TYPE=lib-static Q='' \
-	-Iinclude -Isrc"
+%{__make} Q= \
+	PREFIX=%{_prefix} \
+	COMPONENT_TYPE=lib-static
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
+%{__make} install Q= \
 	PREFIX=%{_prefix} \
 	COMPONENT_TYPE=lib-shared \
-	Q=''
+	DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with static_libs}
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
+%{__make} install Q= \
 	PREFIX=%{_prefix} \
 	COMPONENT_TYPE=lib-static \
-	Q=''
+	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
 %clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libdom.git/commitdiff/a9f7cd23ebcd8f8588e5ce77627abe08bd0cef56



More information about the pld-cvs-commit mailing list