From 42dd5835da4458af4c40ca728d2da0ed5ca23c90 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Tue, 18 Dec 2012 07:17:18 +0400 Subject: Use $(cibs-root) for self-building --- rules/ips-manifest.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rules/ips-manifest.mk') 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)" -- cgit v1.2.3