From 341646752a8b4fb5c6eed6a490a8a75c5069a9a8 Mon Sep 17 00:00:00 2001 From: Gordon Hecker Date: Wed, 4 Nov 2009 13:42:44 +0100 Subject: [PATCH] example: do not pass empty environment variables to example setup Signed-off-by: Gordon Hecker --- example/Makefile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/example/Makefile b/example/Makefile index 470ccc0..6533ba1 100644 --- a/example/Makefile +++ b/example/Makefile @@ -43,6 +43,16 @@ RELEASESDIR = $(LOCALSTATEDIR)/releases PROJECTSDIR = $(LOCALSTATEDIR)/projects UPSTREAMDIR = $(LOCALSTATEDIR)/upstream +ifneq ($(E2_LOCAL_BRANCH),) + E2_LOCAL_BRANCH_ENV = E2_LOCAL_BRANCH=$(E2_LOCAL_BRANCH) +endif +ifneq ($(E2_LOCAL_TAG),) + E2_LOCAL_TAG_ENV = E2_LOCAL_TAG=$(E2_LOCAL_TAG) +endif +ifneq ($(E2_CONFIG),) + E2_CONFIG_ENV = E2_CONFIG=$(E2_CONFIG) +endif + default: example clean: @@ -70,11 +80,11 @@ install_example: fetch # process to the local build inside e2-fetch-project. env -i \ PATH=$(PATH) \ - E2_CONFIG=$(E2_CONFIG) \ + $(E2_CONFIG_ENV) \ HOME=$(HOME) \ USER=$(USER) \ - E2_LOCAL_BRANCH=$(E2_LOCAL_BRANCH) \ - E2_LOCAL_TAG=$(E2_LOCAL_TAG) \ + $(E2_LOCAL_BRANCH_ENV) \ + $(E2_LOCAL_TAG_ENV) \ ./setup_example.sh uninstall_example: -- 2.39.5