Made 'solarispkg' copy pkg/solars to pkg/$(OBJDIR), and go there to NSS_3_6_BRANCH NSS_3_6_1_BETA2
authorkirk.erickson%sun.com
Sun, 17 Nov 2002 17:20:07 +0000
branchNSS_3_6_BRANCH
changeset 3847 7b41867320bd376658ddd49098d59f1137fa7ae7
parent 3835 5600a420889a9e73d061692961c757c9526ca0e8
child 3852 351465385ac24802193c05621fce5847998bf232
push idunknown
push userunknown
push dateunknown
Made 'solarispkg' copy pkg/solars to pkg/$(OBJDIR), and go there to build packages. This addresses the problems Sonja reported which resulted from building in the same tree nfs'd from multiple platforms simultaneously. Also removed -$(MACH) and ROOT-$OBJDIR changes that failed to address this problem.
security/nss/Makefile
security/nss/pkg/solaris/Makefile
security/nss/pkg/solaris/Makefile.com
security/nss/pkg/solaris/Makefile.targ
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -162,10 +162,13 @@ else
 endif
 endif
 
 nss_RelEng_bld: build_coreconf import all
 
 ifeq ($(OS_ARCH),SunOS)
 solarispkg:
 	@echo Making Solaris packages.
-	$(MAKE) -C pkg/solaris publish
+	rm -rf pkg/$(OBJDIR)
+	cp -r pkg/solaris pkg/$(OBJDIR)
+	$(MAKE) -C pkg/$(OBJDIR) publish
+
 endif
--- a/security/nss/pkg/solaris/Makefile
+++ b/security/nss/pkg/solaris/Makefile
@@ -28,25 +28,25 @@ PROTO = \
 	$(ROOT)/usr/lib/mps
 
 ifdef USE_64
 PROTO += $(ROOT)/usr/lib/mps/sparcv9
 endif
 
 include Makefile.com
 
-awk_pkginfo-$(MACH): bld_awk_pkginfo
+awk_pkginfo: bld_awk_pkginfo
 	./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION)
 
-all:: awk_pkginfo-$(MACH) $(PROTO)
-publish: awk_pkginfo-$(MACH) $(PROTO)
+all:: awk_pkginfo $(PROTO)
+publish: awk_pkginfo $(PROTO)
 	+$(LOOP_OVER_DIRS)
 
 clean clobber::
-	$(RM) awk_pkginfo-$(MACH) bld_awk_pkginfo
+	$(RM) awk_pkginfo bld_awk_pkginfo
 	$(RM) -r $(ROOT)
 
 $(ROOT) $(ROOT)/%:
 	mkdir -p $@
 
 ifdef USE_64
 $(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib
 	$(LN) -sf ../../../../$(DIST)/lib $@
--- a/security/nss/pkg/solaris/Makefile.com
+++ b/security/nss/pkg/solaris/Makefile.com
@@ -4,19 +4,19 @@
 #
 #ident	"$Id$"
 #
 
 MACH = $(shell mach)
 
 PUBLISH_ROOT = $(DIST)
 ifeq ($(CORE_DEPTH),../../..)
-ROOT = ROOT-$(OBJDIR_NAME)
+ROOT = ROOT
 else
-ROOT = $(subst ../../../,,$(CORE_DEPTH))/ROOT-$(OBJDIR_NAME)
+ROOT = $(subst ../../../,,$(CORE_DEPTH))/ROOT
 endif
 
 PKGARCHIVE = $(PUBLISH_ROOT)/pkgarchive
 DATAFILES = copyright
 FILES = $(DATAFILES) pkginfo
 
 PACKAGE = $(shell basename `pwd`)
 
--- a/security/nss/pkg/solaris/Makefile.targ
+++ b/security/nss/pkg/solaris/Makefile.targ
@@ -1,17 +1,17 @@
 #
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"$Id$"
 #
 
-pkginfo: pkginfo.tmpl ../awk_pkginfo-$(MACH)
-	$(RM) $@; nawk -f ../awk_pkginfo-$(MACH) $@.tmpl > $@
+pkginfo: pkginfo.tmpl ../awk_pkginfo
+	$(RM) $@; nawk -f ../awk_pkginfo $@.tmpl > $@
 
 pkg: $(PKGARCHIVE)
 	pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)
 
 $(PKGARCHIVE):
 	[ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE)
 
 $(DATAFILES):: %: ../common_files/%