rev 19449 - kde-extras/digikam/trunk/debian

Pino Toscano pino at alioth.debian.org
Sun Apr 7 12:57:24 UTC 2013


Author: pino
Date: 2013-04-07 12:57:24 +0000 (Sun, 07 Apr 2013)
New Revision: 19449

Modified:
   kde-extras/digikam/trunk/debian/rules
Log:
s/CMAKE_ARGS/EXTRA_CMAKE_ARGS/


Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2013-04-07 12:46:10 UTC (rev 19448)
+++ kde-extras/digikam/trunk/debian/rules	2013-04-07 12:57:24 UTC (rev 19449)
@@ -4,10 +4,10 @@
 PRIVATE_LIBDIR := /usr/lib/digikam
 
 ifeq ($(USE_PRIVATE_KDEGRAPHICS),y)
-  CMAKE_ARGS += -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=ON
+  EXTRA_CMAKE_ARGS += -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=ON
   CONFLICTS_SUBSTVAR := libkipi-data, libkexiv2-data, libkdcraw-data, libksane-data
 else
-  CMAKE_ARGS += -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
+  EXTRA_CMAKE_ARGS += -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
 endif
 
 %:
@@ -17,7 +17,7 @@
 
 override_dh_auto_configure:
 	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure --buildsystem=kde \
-                -- -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" -DDIGIKAMSC_COMPILE_DOC=on -DDIGIKAMSC_COMPILE_PO=on $(CMAKE_ARGS)
+                -- -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" -DDIGIKAMSC_COMPILE_DOC=on -DDIGIKAMSC_COMPILE_PO=on $(EXTRA_CMAKE_ARGS)
 
 override_dh_auto_install:
 	dh_auto_install




More information about the pkg-kde-commits mailing list