summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkirk.erickson%sun.com <devnull@localhost>2002-11-11 20:17:54 +0000
committerkirk.erickson%sun.com <devnull@localhost>2002-11-11 20:17:54 +0000
commit668067c48fff7a6c5204d1840ffc0f517ae05fdf (patch)
tree17e74675b02d19431070d60bd1ecdecb8574e282
parent5c7bc5a96f2ebb6bff1ea6dd21c7c198bcc9eb35 (diff)
downloadnss-hg-668067c48fff7a6c5204d1840ffc0f517ae05fdf.tar.gz
Made awk_pkginfo awk_pkginfo-$(MACH) for Sonja's build.
-rw-r--r--security/nss/pkg/solaris/Makefile8
-rw-r--r--security/nss/pkg/solaris/Makefile.targ4
2 files changed, 6 insertions, 6 deletions
diff --git a/security/nss/pkg/solaris/Makefile b/security/nss/pkg/solaris/Makefile
index 2d2ff6ff4..dc40f64b1 100644
--- a/security/nss/pkg/solaris/Makefile
+++ b/security/nss/pkg/solaris/Makefile
@@ -33,15 +33,15 @@ endif
include Makefile.com
-awk_pkginfo: bld_awk_pkginfo
+awk_pkginfo-$(MACH): bld_awk_pkginfo
./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION)
-all:: awk_pkginfo $(PROTO)
-publish: awk_pkginfo $(PROTO)
+all:: awk_pkginfo-$(MACH) $(PROTO)
+publish: awk_pkginfo-$(MACH) $(PROTO)
+$(LOOP_OVER_DIRS)
clean clobber::
- $(RM) awk_pkginfo bld_awk_pkginfo
+ $(RM) awk_pkginfo-$(MACH) bld_awk_pkginfo
$(RM) -r $(ROOT)
$(ROOT) $(ROOT)/%:
diff --git a/security/nss/pkg/solaris/Makefile.targ b/security/nss/pkg/solaris/Makefile.targ
index 279a7bca6..1eb9b8eca 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
- $(RM) $@; nawk -f ../awk_pkginfo $@.tmpl > $@
+pkginfo: pkginfo.tmpl ../awk_pkginfo-$(MACH)
+ $(RM) $@; nawk -f ../awk_pkginfo-$(MACH) $@.tmpl > $@
pkg: $(PKGARCHIVE)
pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE)