From 10a7de4ae7aaa21ec3d5ed5151cbac572d878f01 Mon Sep 17 00:00:00 2001
From: Alexander Pyhalov <apyhalov@gmail.com>
Date: Sat, 03 Oct 2015 21:35:36 +0200
Subject: [PATCH] Add userland incorporation Major differences from upstream: 	- we can construct only one incorporation 	- incorporation should be generated explicitly (publish doesn't depend on it) 	- packages shouldn't explicitly ask to be incorporated, but can ask to be not incorporated 	- we include timestamps in incorporation, as not all packages are properly versioned

---
 make-rules/shared-macros.mk |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/make-rules/shared-macros.mk b/make-rules/shared-macros.mk
index 6f0f5ab..4e6f7c6 100644
--- a/make-rules/shared-macros.mk
+++ b/make-rules/shared-macros.mk
@@ -46,13 +46,15 @@
 	$(shell hg root 2>/dev/null || git rev-parse --show-toplevel)
 endif
 
-WS_LOGS =	$(WS_TOP)/$(MACH)/logs
-WS_REPO =	$(WS_TOP)/$(MACH)/repo
-WS_TOOLS =	$(WS_TOP)/tools
-WS_MAKE_RULES =	$(WS_TOP)/make-rules
-WS_COMPONENTS =	$(WS_TOP)/components
-WS_INCORPORATIONS =	$(WS_TOP)/incorporations
-WS_LINT_CACHE =	$(WS_TOP)/$(MACH)/pkglint-cache
+WS_MACH =       $(WS_TOP)/$(MACH)
+WS_LOGS =       $(WS_MACH)/logs
+WS_REPO =       $(WS_MACH)/repo
+WS_TOOLS =      $(WS_TOP)/tools
+WS_MAKE_RULES = $(WS_TOP)/make-rules
+WS_COMPONENTS = $(WS_TOP)/components
+WS_LICENSES =   $(WS_TOP)/licenses
+WS_INCORPORATIONS =     $(WS_TOP)/incorporations
+WS_LINT_CACHE = $(WS_MACH)/pkglint-cache
 
 # we want our pkg piplines to fail if there is an error
 # (like if pkgdepend fails in the middle of a pipe), but

--
Gitblit v1.9.3