[asterisk-commits] Update stage directory to include optional subdir (repotools[master])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged.

Change subject: Update stage directory to include optional subdir
......................................................................


Update stage directory to include optional subdir

Change-Id: I7e990508323409552ee74c69c8e1c098a9318e1c
---
M build_tools/Makefile.product_rules
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Matt Jordan: Looks good to me, but someone else must approve; Verified
  Joshua Colp: Looks good to me, approved



diff --git a/build_tools/Makefile.product_rules b/build_tools/Makefile.product_rules
index d67a91a..32250f5 100644
--- a/build_tools/Makefile.product_rules
+++ b/build_tools/Makefile.product_rules
@@ -167,7 +167,11 @@
 everything: superclean tarballs_64 tarballs_32
 
 VALID_TAG=$(shell echo $(PRODUCT_VERSION) | sed -n -r -e "s/^([0-9]+\.[0-9]+)_[0-9]+\.[0-9]+\.[0-9]+$$/\1/gp")
-STAGEDIR=$(REPO)/$(MODULE_NAME)/asterisk-$(VALID_TAG)/$(subst _,-,$(ARCH))
+ifeq ($(STAGE_SUBDIR),)
+	STAGEDIR=$(REPO)/$(MODULE_NAME)/asterisk-$(VALID_TAG)/$(subst _,-,$(ARCH))
+else
+	STAGEDIR=$(REPO)/$(MODULE_NAME)/$(STAGE_SUBDIR)/asterisk-$(VALID_TAG)/$(subst _,-,$(ARCH))
+endif
 GIT_STATUS=$(shell git status --porcelain)
 
 checkstage:

-- 
To view, visit https://gerrit.asterisk.org/3444
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e990508323409552ee74c69c8e1c098a9318e1c
Gerrit-PatchSet: 2
Gerrit-Project: repotools
Gerrit-Branch: master
Gerrit-Owner: Scott Griepentrog <sgriepentrog at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>