[Reproducible-commits] [cdbs] 08/41: Tighten cdbs_make_curflavor resolving, to simplify its use.

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch reproducible
in repository cdbs.

commit b8fd4e36e4c36bdc280b7cb9a4200555eaeb6bf1
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Oct 10 14:01:50 2014 +0200

    Tighten cdbs_make_curflavor resolving, to simplify its use.
---
 1/class/autotools.mk.in        | 3 +--
 1/class/makefile.mk.in         | 3 ++-
 1/class/python-autotools.mk.in | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/1/class/autotools.mk.in b/1/class/autotools.mk.in
index 635e5c1..6f72a34 100644
--- a/1/class/autotools.mk.in
+++ b/1/class/autotools.mk.in
@@ -26,8 +26,7 @@ include $(_cdbs_class_path)/autotools-files.mk$(_cdbs_makefile_suffix)
 cdbs_autotools_configure_stamps = $(if $(cdbs_make_flavors),\
 	$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-autotools/%,$(cdbs_make_flavors)),\
 	debian/stamp-autotools)
-cdbs_configure_flags += $(if $(cdbs_make_flavors),\
-	$(DEB_CONFIGURE_FLAGS_$(cdbs_make_curflavor)))
+cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_$(cdbs_make_curflavor))
 
 # Overriden from makefile-vars.mk.  We pass CFLAGS and friends to
 # ./configure, so no need to pass them to make.
diff --git a/1/class/makefile.mk.in b/1/class/makefile.mk.in
index 9575657..bd43013 100644
--- a/1/class/makefile.mk.in
+++ b/1/class/makefile.mk.in
@@ -44,7 +44,8 @@ cdbs_make_check_stamps = $(strip $(if $(cdbs_make_flavors),\
 cdbs_make_clean_nonstamps = $(if $(cdbs_make_flavors),\
 	$(patsubst %,makefile-clean/%,$(cdbs_make_flavors)),\
 	makefile-clean)
-cdbs_make_curflavor = $(filter-out %/,$(subst /,/ ,$@))
+cdbs_make_curflavor = $(strip $(if $(cdbs_make_flavors),\
+	$(filter-out %/,$(subst /,/ ,$@))))
 cdbs_make_curbuilddir = $(strip $(if $(cdbs_make_flavors),\
 	$(subst @FLAVOR@,$(cdbs_make_curflavor),$(or $(strip \
 		$(DEB_MAKE_BUILDDIRSKEL_$(cdbs_make_curflavor))),$(strip \
diff --git a/1/class/python-autotools.mk.in b/1/class/python-autotools.mk.in
index 95efa42..5bf4e08 100644
--- a/1/class/python-autotools.mk.in
+++ b/1/class/python-autotools.mk.in
@@ -43,7 +43,7 @@ CDBS_BUILD_DEPENDS += , $(CDBS_BUILD_DEPENDS_class_python-autotools_python)
 # FIXME: Restructure to allow early override
 DEB_CONFIGURE_SCRIPT_ENV += PYTHON="$(or $(strip \
 	$(python$(cdbs_python$(cdbs_curpythonstem)_nondefault_version):%=python%)),$(strip \
-	$(call cdbs_python_binary,python$(if $(cdbs_make_flavors),$(cdbs_make_curflavor)))))"
+	$(call cdbs_python_binary,python$(cdbs_make_curflavor))))"
 
 # Install all flavors on top of each other by default
 DEB_MAKE_DESTDIRSKEL = $(cdbs_curdestdir)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/cdbs.git