From 4380067b18469a9bf272cd7c91831808bfebd4c8 Mon Sep 17 00:00:00 2001 From: "christophe.ravel.bugs%sun.com" Date: Thu, 22 Jul 2004 17:52:04 +0000 Subject: [PATCH] 238319: Sun packages changes. --- security/jss/pkg/solaris/Makefile | 19 ++++++++++++++++++- security/jss/pkg/solaris/Makefile.targ | 13 ++++++++++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/security/jss/pkg/solaris/Makefile b/security/jss/pkg/solaris/Makefile index 7733bc118ada..17685db0b200 100644 --- a/security/jss/pkg/solaris/Makefile +++ b/security/jss/pkg/solaris/Makefile @@ -2,7 +2,7 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile,v 1.8 2004/07/20 20:39:25 glen.beasley%sun.com Exp $" +#ident "$Id: Makefile,v 1.9 2004/07/22 17:52:04 christophe.ravel.bugs%sun.com Exp $" # CORE_DEPTH = ../../.. @@ -29,6 +29,8 @@ ifeq ($(MACH),sparc) endif DIST64 = $(shell echo $(DIST) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g") +OBJ32 = $(shell basename $(DIST)) +OBJ64 = $(shell basename $(DIST64)) awk_pkginfo: bld_awk_pkginfo ./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION) @@ -47,15 +49,30 @@ $(ROOT): $(ROOT)/usr/lib/mps/sparcv9: mkdir -p $@ $(CP) -r $(DIST64)/lib/*.so $@ +ifdef JSS3_LOCATION + $(CP) $(JSS3_LOCATION)/$(OBJ64)/lib/libjss3.so $@ +endif + $(ROOT)/usr/share/lib/mps/sparcv9: echo "target=$(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR)" mkdir -p $@ $(CP) $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR) $@/jss4.jar +ifdef JSS3_LOCATION + $(CP) $(JSS3_LOCATION)/$(IMPORT_XPCLASS_JAR) $@/jss3.jar +endif + $(ROOT)/usr/lib/mps: mkdir -p $@ $(CP) -r $(DIST)/lib/*.so $@ +ifdef JSS3_LOCATION + $(CP) $(JSS3_LOCATION)/$(OBJ32)/lib/libjss3.so $@ +endif + $(ROOT)/usr/share/lib/mps: echo "target=$(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR)" mkdir -p $@ $(CP) $(SOURCE_RELEASE_XP_DIR)/$(SOURCE_RELEASE_XP_CLASSES_DIR)/$(IMPORT_XPCLASS_JAR) $@/jss4.jar +ifdef JSS3_LOCATION + $(CP) $(JSS3_LOCATION)/$(IMPORT_XPCLASS_JAR) $@/jss3.jar +endif diff --git a/security/jss/pkg/solaris/Makefile.targ b/security/jss/pkg/solaris/Makefile.targ index 90599565c7a9..df480a2c116d 100644 --- a/security/jss/pkg/solaris/Makefile.targ +++ b/security/jss/pkg/solaris/Makefile.targ @@ -2,14 +2,21 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.targ,v 1.4 2004/06/14 23:24:57 christophe.ravel.bugs%sun.com Exp $" +#ident "$Id: Makefile.targ,v 1.5 2004/07/22 17:52:04 christophe.ravel.bugs%sun.com Exp $" # +ifdef JSS3_LOCATION + PROTOTYPE_BASE=prototype3_ +else + PROTOTYPE_BASE=prototype_ +endif + pkginfo: pkginfo.tmpl ../awk_pkginfo $(RM) $@; nawk -f ../awk_pkginfo $@.tmpl > $@ -pkg: $(PKGARCHIVE) pkgdepend prototype_$(MACH) - pkgmk -f prototype_$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE) +pkg: $(PKGARCHIVE) pkgdepend $(PROTOTYPE_BASE)$(MACH) + @echo "Using $(PROTOTYPE_BASE)$(MACH) to build package $(PACKAGE)" + pkgmk -f $(PROTOTYPE_BASE)$(MACH) -d $(PKGARCHIVE) -r $(ROOT) -o $(PACKAGE) $(PKGARCHIVE): [ -d $(PKGARCHIVE) ] || mkdir -p $(PKGARCHIVE)