--- a/make-rules/shared-macros.mk	Mon Jun 29 11:36:22 2015 -0700
+++ b/make-rules/shared-macros.mk	Mon Jun 29 18:33:05 2015 -0700
@@ -53,6 +53,7 @@
 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
 
@@ -77,12 +78,6 @@
 
 SHELL=	/bin/bash
 
-# If we are building "pre-release" software for the Solaris release repository
-# we want the PUBLISHER to be "solaris".
-ifeq ($(BUILD_TYPE),pre-release)
-PUBLISHER = solaris
-endif
-
 # We want "nightly" as our publisher, to match other consolidations and
 # facilitate migrations.  G11N wants $(CONSOLIDATION)-localizable for
 # the localizable publisher.