diff options
| author | kirk.erickson%sun.com <devnull@localhost> | 2002-11-14 20:34:44 +0000 |
|---|---|---|
| committer | kirk.erickson%sun.com <devnull@localhost> | 2002-11-14 20:34:44 +0000 |
| commit | ebeb893d9f9cfc8f99d5fd31b86365c858d0659e (patch) | |
| tree | 63964d836d81d5aa5b072b03638d17f30243e2ae | |
| parent | 1743cb7e410da45430de26d0d5f927554e8ad74b (diff) | |
| download | nspr-hg-ebeb893d9f9cfc8f99d5fd31b86365c858d0659e.tar.gz | |
Made 'solarispkg' target copy pkg/solaris to pkg/solaris-$(OBJDIR).
This is to avoid collisions with temp files when Sonja builds multiple
platforms in the same tree simultaneously. Also backed out of -$(MACH)
hacks on the temp files done recently. Also reverted to ROOT rather
than ROOT-$(OBJDIR) since the higher level fix addressed the problem.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | pkg/solaris/Makefile | 8 | ||||
| -rw-r--r-- | pkg/solaris/Makefile.com | 4 | ||||
| -rw-r--r-- | pkg/solaris/Makefile.targ | 4 |
4 files changed, 11 insertions, 9 deletions
@@ -124,7 +124,9 @@ endif solarispkg: @echo Making Solaris packages. - $(MAKE) -C pkg/solaris publish + rm -rf pkg/solaris-$(OBJDIR) + cp -r pkg/solaris pkg/solaris-$(OBJDIR) + $(MAKE) -C pkg/solaris-$(OBJDIR) publish depend: @echo "NSPR20 has no dependencies. Skipped." diff --git a/pkg/solaris/Makefile b/pkg/solaris/Makefile index 6f0b504a..d883cc9d 100644 --- a/pkg/solaris/Makefile +++ b/pkg/solaris/Makefile @@ -32,15 +32,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/pkg/solaris/Makefile.com b/pkg/solaris/Makefile.com index e1aa696b..e4fae816 100644 --- a/pkg/solaris/Makefile.com +++ b/pkg/solaris/Makefile.com @@ -9,9 +9,9 @@ MACH = $(shell mach) PUBLISH_ROOT = $(DIST) ifeq ($(MOD_DEPTH),../..) -ROOT = ROOT-$(OBJDIR_NAME) +ROOT = ROOT else -ROOT = $(subst ../../,,$(MOD_DEPTH))/ROOT-$(OBJDIR_NAME) +ROOT = $(subst ../../,,$(MOD_DEPTH))/ROOT endif PKGARCHIVE = $(PUBLISH_ROOT)/pkgarchive diff --git a/pkg/solaris/Makefile.targ b/pkg/solaris/Makefile.targ index 9ed0f074..03aab7d2 100644 --- a/pkg/solaris/Makefile.targ +++ b/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) |