components/meta-packages/history/Makefile
branchs11-update
changeset 2710 3c5579720afc
parent 2434 6c9bb5cf5610
child 2994 3705b92dce6a
--- a/components/meta-packages/history/Makefile	Wed Jul 31 10:48:30 2013 -0700
+++ b/components/meta-packages/history/Makefile	Thu Aug 01 14:22:38 2013 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -54,7 +54,7 @@
 	$(PKGMOGRIFY) -D CONSOLIDATION=$(CONSOLIDATION) $< > $@
 
 $(MANIFEST_BASE)-%.published: $(MANIFEST_BASE)-%.mogrified $(BUILD_DIR)
-	$(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest $<
+	$(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest --no-catalog $<
 	$(CP) $< $@
 
 $(BUILD_DIR)/.linted-$(MACH): $(MOGRIFIED) $(BUILD_DIR)
@@ -64,6 +64,9 @@
 	$(TOUCH) $@
 
 $(BUILD_DIR)/.published-$(MACH): $(BUILD_DIR)/.linted-$(MACH) $(PUBLISHED)
+ifndef DISABLE_IPS_CATALOG_AND_INDEX_UPDATES
+	$(PKGREPO) refresh -s $(PKG_REPO)
+endif
 	$(TOUCH) $@
 
 publish: $(BUILD_DIR)/.published-$(MACH)