diff options
| author | kirk.erickson%sun.com <devnull@localhost> | 2002-11-17 17:26:51 +0000 |
|---|---|---|
| committer | kirk.erickson%sun.com <devnull@localhost> | 2002-11-17 17:26:51 +0000 |
| commit | 46d3f84424d86a9e681c1de329f32cec4527f781 (patch) | |
| tree | a39562024496d00c79d248389660b5776fa515b4 | |
| parent | cf795621eb9dfec5d54252255de33da7c9c666d4 (diff) | |
| download | nss-hg-46d3f84424d86a9e681c1de329f32cec4527f781.tar.gz | |
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.
| -rw-r--r-- | security/nss/Makefile | 4 | ||||
| -rw-r--r-- | security/nss/pkg/solaris/Makefile | 8 | ||||
| -rw-r--r-- | security/nss/pkg/solaris/Makefile.com | 4 | ||||
| -rw-r--r-- | security/nss/pkg/solaris/Makefile.targ | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/security/nss/Makefile b/security/nss/Makefile index 41c7a762a..321db9af0 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile @@ -167,5 +167,7 @@ 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 diff --git a/security/nss/pkg/solaris/Makefile b/security/nss/pkg/solaris/Makefile index dc40f64b1..2d2ff6ff4 100644 --- a/security/nss/pkg/solaris/Makefile +++ b/security/nss/pkg/solaris/Makefile @@ -33,15 +33,15 @@ 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)/%: diff --git a/security/nss/pkg/solaris/Makefile.com b/security/nss/pkg/solaris/Makefile.com index 8e7a8d3a6..dfeb79911 100644 --- a/security/nss/pkg/solaris/Makefile.com +++ b/security/nss/pkg/solaris/Makefile.com @@ -9,9 +9,9 @@ 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 diff --git a/security/nss/pkg/solaris/Makefile.targ b/security/nss/pkg/solaris/Makefile.targ index 1eb9b8eca..279a7bca6 100644 --- a/security/nss/pkg/solaris/Makefile.targ +++ b/security/nss/pkg/solaris/Makefile.targ @@ -5,8 +5,8 @@ #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) |