aboutsummaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-10-12 20:12:11 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-10-12 20:15:13 +0400
commit9ca077ca8bb98f634ca4c0eb0f0e32490d1a9d4e (patch)
treefe63a054e11296807b90c21dbfc786d55fae4a2f /rules
parentf8a0de4a9bd9f7fbf0b2c0b07f86b55b9c3e3f08 (diff)
downloadcibs-9ca077ca8bb98f634ca4c0eb0f0e32490d1a9d4e.tar.gz
Do not add sourcedir to proto dir list by default
Only if using git or archives. This allow creating dummy packages consisting only of manifests.
Diffstat (limited to 'rules')
-rw-r--r--rules/archive.mk2
-rw-r--r--rules/git.mk2
-rw-r--r--rules/ips.mk2
3 files changed, 5 insertions, 1 deletions
diff --git a/rules/archive.mk b/rules/archive.mk
index 12dd6d7..f49c44b 100644
--- a/rules/archive.mk
+++ b/rules/archive.mk
@@ -26,6 +26,8 @@ ifeq (,$(__archive_mk))
.SECONDEXPANSION:
+protodirs += $(sourcedir)
+
archive-validator := /usr/share/cibs/scripts/validate-archive
validate-%-stamp: download-%-stamp
if [ -n "$(checksum_$*)" ]; then \
diff --git a/rules/git.mk b/rules/git.mk
index b631f1a..23a96c7 100644
--- a/rules/git.mk
+++ b/rules/git.mk
@@ -24,6 +24,8 @@
# include guard
ifeq (,$(__git_mk))
+protodirs += $(sourcedir)
+
build-depends += developer/versioning/git
download-stamp: check-build-dep-stamp
diff --git a/rules/ips.mk b/rules/ips.mk
index 734b173..dabc26d 100644
--- a/rules/ips.mk
+++ b/rules/ips.mk
@@ -48,7 +48,7 @@ pkg-define += \
# Where to find files:
pkg-protos = $(protodirs:%=-d "%")
-pkg-protos += -d "$(sourcedir)" -d .
+pkg-protos += -d .
transformations := \
$(transdir)/defaults \