From 03f4febe81472ba2829443e9cb8ef418d9e6cc49 Mon Sep 17 00:00:00 2001
From: Igor Pashev <igor.pashev@nexenta.com>
Date: Wed, 30 Jan 2013 13:52:21 +0400
Subject: Ensuse that searching in proto dirs has predictable order:

1. Top directory first
2. Variants' proto dirs in order variants are defined

Remove source dir from proto dirs, but add $(sourcedir)
to IPS defines, so one can write:
file $(sourcedir)/README path=/usr/share/doc/foo/README
---
 rules/autotools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rules/autotools.mk')

diff --git a/rules/autotools.mk b/rules/autotools.mk
index 0e51401..d9b76b6 100644
--- a/rules/autotools.mk
+++ b/rules/autotools.mk
@@ -27,7 +27,7 @@ ifeq (,$(__autotools_mk))
 include $(cibs-root)/rules/common.mk
 
 
-configure := $(sourcedir)/configure
+configure := $(topdir)/$(sourcedir)/configure
 configure-env = \
 	CC="$(CC)" \
 	CXX="$(CXX)" \
@@ -62,7 +62,7 @@ build-%-stamp:
 	touch $@
 
 install-%-stamp: target = install
-install-%-stamp: make-vars = DESTDIR="$(protodir)"
+install-%-stamp: make-vars = DESTDIR="$(topdir)/$(protodir)"
 install-%-stamp:
 	cd "$(builddir)" && $(MAKE) $(target) $(make-vars)
 	touch $@
-- 
cgit v1.2.3