24826424 do not publish desktop-cache when BUILD_TYPE=evaluation
authorJohn Beck <John.Beck@Oracle.COM>
Mon, 10 Oct 2016 14:27:02 -0700
changeset 7087 b1fa0d70e09e
parent 7086 bad5d0bc7457
child 7089 bb4d7431eea3
24826424 do not publish desktop-cache when BUILD_TYPE=evaluation
components/desktop/desktop-cache/Makefile
--- a/components/desktop/desktop-cache/Makefile	Tue Oct 11 11:08:35 2016 -0700
+++ b/components/desktop/desktop-cache/Makefile	Mon Oct 10 14:27:02 2016 -0700
@@ -33,15 +33,21 @@
 
 # nothing to download or build; just package
 BUILD_STYLE= pkg
+
+# Uses a feature in a gtk script not added until S12.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
 include $(WS_MAKE_RULES)/common.mk
 
 # Make sure SMF manifests are valid
+ifneq ($(BUILD_TYPE), evaluation)
 $(BUILD_DIR)/.validated-smf-manifests-$(MACH): $(BUILD_DIR)
 	@for f in files/*.xml ; do \
 	    [[ "$$f" == "files/com.oracle.solaris.gdm-temporary.xml" ]] || \
 	    (set -ex ; /usr/sbin/svccfg validate "$$f") ; \
 	done
 	$(TOUCH) [email protected]
+endif
 
 validate-smf:	$(BUILD_DIR)/.validated-smf-manifests-$(MACH)
 build:		$(BUILD_DIR)/.validated-smf-manifests-$(MACH)