packages: rpm-build-macros/rpm.macros - let %if being expanded

glen glen at pld-linux.org
Thu Aug 26 17:00:37 CEST 2010


Author: glen                         Date: Thu Aug 26 15:00:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- let %if being expanded

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.576 -> 1.577) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.576 packages/rpm-build-macros/rpm.macros:1.577
--- packages/rpm-build-macros/rpm.macros:1.576	Thu Aug 26 16:55:26 2010
+++ packages/rpm-build-macros/rpm.macros	Thu Aug 26 17:00:31 2010
@@ -239,19 +239,19 @@
 	%{dependencytracking} \
 }
 
-%cmake { \
-CC="%{__cc}" \
-CXX="%{__cxx}" \
-CFLAGS="%{rpmcflags}" \
-CXXFLAGS="%{rpmcxxflags}" \
-LDFLAGS="%{rpmldflags}" \
-%{__cmake} \
-	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \
+%cmake \
+CC="%{__cc}" \\\
+CXX="%{__cxx}" \\\
+CFLAGS="%{rpmcflags}" \\\
+CXXFLAGS="%{rpmcxxflags}" \\\
+LDFLAGS="%{rpmldflags}" \\\
+%{__cmake} \\\
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \\\
+	-DCMAKE_BUILD_TYPE=%{!?debug:Release}%{?debug:Debug} \\\
 %if "%{_lib}" == "lib64" \
-	-DLIB_SUFFIX=64 \
+	-DLIB_SUFFIX=64 \\\
 %endif \
-}
+%{nil}
 
 %scons { \
 %{__scons} \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.576&r2=1.577&f=u



More information about the pld-cvs-commit mailing list