From 42dd5835da4458af4c40ca728d2da0ed5ca23c90 Mon Sep 17 00:00:00 2001
From: Igor Pashev <igor.pashev@nexenta.com>
Date: Tue, 18 Dec 2012 07:17:18 +0400
Subject: Use $(cibs-root) for self-building

---
 rules/32.mk           | 2 +-
 rules/64.mk           | 2 +-
 rules/archive.mk      | 6 +++---
 rules/autoreconf.mk   | 2 +-
 rules/autotools.mk    | 2 +-
 rules/copy.mk         | 2 +-
 rules/deb.mk          | 4 ++--
 rules/ips-manifest.mk | 6 +++---
 rules/ips.mk          | 2 +-
 rules/noarch.mk       | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/rules/32.mk b/rules/32.mk
index 083590d..79cde7e 100644
--- a/rules/32.mk
+++ b/rules/32.mk
@@ -23,7 +23,7 @@
 
 ifeq (,$(__32_mk))
 
-include /usr/share/cibs/rules/common.mk
+include $(cibs-root)/rules/common.mk
 
 $(eval $(call add-variant,32))
 
diff --git a/rules/64.mk b/rules/64.mk
index 064bf79..08490e5 100644
--- a/rules/64.mk
+++ b/rules/64.mk
@@ -23,7 +23,7 @@
 
 ifeq (,$(__64_mk))
 
-include /usr/share/cibs/rules/common.mk
+include $(cibs-root)/rules/common.mk
 
 $(eval $(call add-variant,64))
 
diff --git a/rules/archive.mk b/rules/archive.mk
index c5df189..1c9f469 100644
--- a/rules/archive.mk
+++ b/rules/archive.mk
@@ -29,7 +29,7 @@ ifeq (,$(__archive_mk))
 protodirs += $(sourcedir)
 build-depends += archiver/gnu-tar
 
-archive-validator := /usr/share/cibs/scripts/validate-archive
+archive-validator := $(cibs-root)/scripts/validate-archive
 validate-%-stamp: download-%-stamp
 	if [ -n "$(checksum_$*)" ]; then \
 		$(archive-validator) $* $(checksum_$*) ; \
@@ -45,7 +45,7 @@ validate-stamp: $$(addprefix validate-,$$(addsuffix -stamp,$$(archives) $$(archi
 validate: validate-stamp
 
 
-archive-downloader := /usr/share/cibs/scripts/download-archive
+archive-downloader := $(cibs-root)/scripts/download-archive
 downloader-mirrors = $(mirrors:%=-m %)
 download-%-stamp:
 	if ! [ -f '$*' ]; then \
@@ -64,7 +64,7 @@ download-stamp: $$(addprefix download-,$$(addsuffix -stamp,$$(archives) $$(archi
 download: download-stamp
 
 
-archive-unpacker := /usr/share/cibs/scripts/unpack-archive
+archive-unpacker := $(cibs-root)/scripts/unpack-archive
 unpack-%-stamp: validate-%-stamp check-build-dep-stamp
 	$(archive-unpacker) $* $(sourcedir_$*) $(sourcedir)
 	touch $@
diff --git a/rules/autoreconf.mk b/rules/autoreconf.mk
index ba6f495..fe4dcdc 100644
--- a/rules/autoreconf.mk
+++ b/rules/autoreconf.mk
@@ -24,7 +24,7 @@
 # include guard
 ifeq (,$(__autoreconf_mk))
 
-include /usr/share/cibs/rules/common.mk
+include $(cibs-root)/rules/common.mk
 
 build-depends += \
 	pkg:/developer/build/libtool \
diff --git a/rules/autotools.mk b/rules/autotools.mk
index 0829bfb..ce9d3be 100644
--- a/rules/autotools.mk
+++ b/rules/autotools.mk
@@ -24,7 +24,7 @@
 # include guard
 ifeq (,$(__autotools_mk))
 
-include /usr/share/cibs/rules/common.mk
+include $(cibs-root)/rules/common.mk
 
 
 configure := $(sourcedir)/configure
diff --git a/rules/copy.mk b/rules/copy.mk
index c61c960..3ff203c 100644
--- a/rules/copy.mk
+++ b/rules/copy.mk
@@ -23,7 +23,7 @@
 
 ifeq (,$(__copy_mk))
 
-include /usr/share/cibs/rules/common.mk
+include $(cibs-root)/rules/common.mk
 
 pre-configure-stamp: copy-stamp
 
diff --git a/rules/deb.mk b/rules/deb.mk
index 6783ae0..aa49988 100644
--- a/rules/deb.mk
+++ b/rules/deb.mk
@@ -24,9 +24,9 @@
 # include guard:
 ifeq (,$(__deb_mk))
 
-include /usr/share/cibs/rules/ips-manifest.mk
+include $(cibs-root)/rules/ips-manifest.mk
 
-debmaker := /usr/share/cibs/scripts/debmaker.pl
+debmaker := $(cibs-root)/scripts/debmaker.pl
 
 # Can be overriden in Makefile. Both.
 deb-version = $(ips-version)
diff --git a/rules/ips-manifest.mk b/rules/ips-manifest.mk
index 087cf85..e15b84f 100644
--- a/rules/ips-manifest.mk
+++ b/rules/ips-manifest.mk
@@ -24,10 +24,10 @@
 # include guard:
 ifeq (,$(__ips_manifest_mk))
 
-include /usr/share/cibs/rules/common.mk
+include $(cibs-root)/rules/common.mk
 
 manifestdir := $(workdir)/manifest
-transdir := /usr/share/cibs/trans
+transdir := $(cibs-root)/trans
 
 # Default, can be overriden in Makefile. See next lines.
 ips-version = $(version)
@@ -98,7 +98,7 @@ endif
 manifests := $(filter-out $(generated-manifests),$(wildcard *.p5m))
 
 #TODO: Expand "glob" action in manifests:
-globalizator := /usr/share/cibs/scripts/globalizator
+globalizator := $(cibs-root)/scripts/globalizator
 glob-manifests := $(manifests:%=$(manifestdir)/glob-%)
 $(glob-manifests): $(manifestdir)/glob-% : %
 	[ -d "$(manifestdir)" ] || mkdir -p "$(manifestdir)"
diff --git a/rules/ips.mk b/rules/ips.mk
index 28dfbfb..e78f2db 100644
--- a/rules/ips.mk
+++ b/rules/ips.mk
@@ -24,7 +24,7 @@
 # include guard:
 ifeq (,$(__ips_mk))
 
-include /usr/share/cibs/rules/ips-manifest.mk
+include $(cibs-root)/rules/ips-manifest.mk
 
 res_suffix := resolved
 resolved-manifests := $(manifests:%=$(manifestdir)/depend-%.$(res_suffix))
diff --git a/rules/noarch.mk b/rules/noarch.mk
index 8c80257..e49e36a 100644
--- a/rules/noarch.mk
+++ b/rules/noarch.mk
@@ -23,7 +23,7 @@
 
 ifeq (,$(__noarch_mk))
 
-include /usr/share/cibs/rules/common.mk
+include $(cibs-root)/rules/common.mk
 
 $(eval $(call add-variant,noarch))
 
-- 
cgit v1.2.3