rpms/kde-filesystem/devel macros.kde4,1.1.2.2,1.1.2.3

Than Ngo (than) fedora-extras-commits at redhat.com
Wed Aug 8 13:40:10 UTC 2007


Author: than

Update of /cvs/extras/rpms/kde-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2287

Modified Files:
      Tag: kde-filesystem-kde4-branch
	macros.kde4 
Log Message:
fix macro



Index: macros.kde4
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/Attic/macros.kde4,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- macros.kde4	8 Aug 2007 12:31:09 -0000	1.1.2.2
+++ macros.kde4	8 Aug 2007 13:39:37 -0000	1.1.2.3
@@ -9,29 +9,22 @@
 %_kde_bindir %_kde_prefix/bin
 %_kde_sbindir %_kde_prefix/sbin
 %_kde_includedir %_kde_prefix/include
+%_kde_debug RelWithDebInfo
 
 %kde4_cmake \
-  %define debug 1 \
-
   QTDIR="%_qt4_prefix" ; export QTDIR ; \
   PATH="%_qt4_prefix/bin:$PATH" ; export PATH ; \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
   CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
   FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
-
   cmake \\\
   %if "%{_lib}" != "lib" \
     -DLIB_SUFFIX=64 \\\
   %endif \
-  %if %debug \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \\\
-  %else \
-    -DKDE4_ENABLE_FINAL=ON \\\
-  %endif \
-
+  -DCMAKE_BUILD_TYPE=%_kde_debug \\\
   -DCMAKE_INSTALL_PREFIX=%_kde_prefix \\\
   -DCMAKE_INSTALL_LIBDIR=%_kde_libdir \\\
-  -DSYSCONF_INSTALL_DIR=%_kde_sysconfdir \\\
+  -DSYSCONF_INSTALL_DIR=%_sysconfdir \\\
   -DINCLUDE_INSTALL_DIR=%_kde_includedir \\\
   -DLIB_INSTALL_DIR=%_kde_libdir \\\
   -DDATA_INSTALL_DIR=%_kde_share_dir/apps \\\




More information about the fedora-extras-commits mailing list