From fceb7dd59defa5f07a9be22a895992462bfbf408 Mon Sep 17 00:00:00 2001
From: Igor Pashev <igor.pashev@nexenta.com>
Date: Wed, 17 Apr 2013 19:48:42 +0400
Subject: Do not pass proto dir if it does not exist

---
 rules/ips-manifest.mk | 11 ++++++-----
 rules/ips.mk          |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/rules/ips-manifest.mk b/rules/ips-manifest.mk
index 78f3d83..f8c7b5b 100644
--- a/rules/ips-manifest.mk
+++ b/rules/ips-manifest.mk
@@ -57,10 +57,7 @@ pkg-define += $(foreach _,$(variants),-D builddir.$(_)="$(builddir.$(_))")
 
 pkg-define += -D sourcedir="$(sourcedir)"
 
-# Where to find files:
-pkg-protos = -d .
-pkg-protos += $(protodirs:%=-d "%")
-pkg-protos += $(foreach _,$(variants),-d "$(protodir.$(_))")
+protodirs += $(foreach _,$(variants),$(protodir.$(_)))
 
 transformations := \
 $(transdir)/defaults \
@@ -133,7 +130,11 @@ mogrify-stamp: $(mogrified-manifests)
 
 depend-manifests := $(manifests:%=$(manifestdir)/depend-%)
 $(manifestdir)/depend-% : $(manifestdir)/mogrified-%
-	pkgdepend generate -m $(pkg-protos) $< > $@ || (rm -f $@; exit 1)
+	@protos="-d ."; for p in $(protodirs); do \
+		   if [ -d $$p ]; then protos="$$protos -d $$p"; fi \
+		   done; \
+	   set -x; \
+		pkgdepend generate -m $$protos $< > $@ || (rm -f $@; exit 1)
 depend-stamp: $(depend-manifests)	
 	touch $@
 $(depend-manifests): install-stamp	
diff --git a/rules/ips.mk b/rules/ips.mk
index e78f2db..3dc4d25 100644
--- a/rules/ips.mk
+++ b/rules/ips.mk
@@ -39,9 +39,11 @@ pre-publish: resolve-stamp
 
 publish-stamp: pre-publish
 	@if [ -n "$(ips-repo)" ]; then \
+		protos="-d ."; for p in $(protodirs); do \
+			if [ -d $$p ]; then protos="$$protos -d $$p"; fi; done; \
 	set -x; \
 	for m in $(resolved-manifests); do \
-		pkgsend -s $(ips-repo) publish --fmri-in-manifest $(pkg-protos) $$m || exit 1; \
+		pkgsend -s $(ips-repo) publish --fmri-in-manifest $$protos $$m || exit 1; \
 	done; \
 	touch $@; \
 	else \
-- 
cgit v1.2.3