[SCM] ardour3/master: Pass env variables to waf

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ae11cc02389f29f0e7c3545f35606a113ce68d60
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Sep 24 11:33:11 2013 -0300

    Pass env variables to waf

diff --git a/debian/rules b/debian/rules
index f63d15f..bddfc15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ waf-configure-options = --lv2 --lxvst --freedesktop --configdir=/etc/ --noconfir
 
 DEB_MAKE_EXTRA_ARGS = -v --destdir=$(CURDIR)/debian/tmp
 DEB_MAKE_BUILD_TARGET = build i18n_mo
+DEB_MAKE_ENVVARS = CFLAGS="$(or $(CFLAGS_$(cdbs_curpkg)),$(CFLAGS))" CXXFLAGS="$(or $(CXXFLAGS_$(cdbs_curpkg)),$(CXXFLAGS))" CPPFLAGS="$(or $(CPPFLAGS_$(cdbs_curpkg)),$(CPPFLAGS))" LDFLAGS="$(or $(LDFLAGS_$(cdbs_curpkg)),$(LDFLAGS))"
 DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) $(CURDIR)/waf-light $(DEB_MAKE_EXTRA_ARGS)
 DEB_MAKE_INSTALL_TARGET = install
 
@@ -77,7 +78,7 @@ libs/ardour/revision.cc:
 
 debian/stamp-waf-configure:
 	chmod +x ./waf-light
-	./waf-light configure $(waf-configure-options)
+	$(DEB_MAKE_INVOKE) configure $(waf-configure-options)
 	touch $@
 clean::
 	rm -f debian/stamp-waf-configure

-- 
ardour3 packaging