r36420 - in /packages/fenics/dolfin/trunk/debian/cdbs/1/class: scons-vars.mk scons.mk

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Mon Apr 26 07:07:57 2010
New Revision: 36420

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36420
Log:
Add configure target to cdbs tweaks for scons.

Modified:
    packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons-vars.mk
    packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons.mk

Modified: packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons-vars.mk
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons-vars.mk?rev=36420&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons-vars.mk (original)
+++ packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons-vars.mk Mon Apr 26 07:07:57 2010
@@ -36,6 +36,10 @@
 # general options (passed on all scons commands)
 DEB_SCONS_OPTIONS =
 
+# configure target and options (only passed on configure)
+DEB_SCONS_CONFIGURE_TARGET =
+DEB_SCONS_CONFIGURE_OPTIONS =
+
 # build target and options (only passed on build)
 DEB_SCONS_BUILD_TARGET =
 DEB_SCONS_BUILD_OPTIONS =

Modified: packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons.mk
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons.mk?rev=36420&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons.mk (original)
+++ packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons.mk Mon Apr 26 07:07:57 2010
@@ -35,6 +35,15 @@
 
 DEB_PHONY_RULES += scons-clean
 
+common-configure-arch common-configure-indep:: common-configure-impl
+common-configure-impl::
+	@if test -n "$(DEB_SCONS_CONFIGURE_TARGET)"; then \
+	  echo $(DEB_SCONS_INVOKE) $(DEB_SCONS_CONFIGURE_TARGET) $(DEB_SCONS_OPTIONS) $(DEB_SCONS_CONFIGURE_OPTIONS); \
+	  $(DEB_SCONS_INVOKE) $(DEB_SCONS_CONFIGURE_TARGET) $(DEB_SCONS_OPTIONS) $(DEB_SCONS_CONFIGURE_OPTIONS); \
+	else \
+	  echo "DEB_SCONS_CONFIGURE_TARGET unset, skipping default scons.mk common-configure target"; \
+	fi
+
 common-build-arch common-build-indep:: debian/stamp-scons-build
 debian/stamp-scons-build:
 	$(DEB_SCONS_INVOKE) $(DEB_SCONS_BUILD_TARGET) $(DEB_SCONS_OPTIONS) $(DEB_SCONS_BUILD_OPTIONS)