diff options
| author | christophe.ravel.bugs%sun.com <devnull@localhost> | 2004-06-14 23:28:17 +0000 |
|---|---|---|
| committer | christophe.ravel.bugs%sun.com <devnull@localhost> | 2004-06-14 23:28:17 +0000 |
| commit | be91460b04649176eaff6d6b3ce226493b5bbd16 (patch) | |
| tree | 0989413d44498ab689b37d75d4f706f0d577646c | |
| parent | 64d3d48eaecc261da6e7744b12c5380843b70fac (diff) | |
| download | nspr-hg-be91460b04649176eaff6d6b3ce226493b5bbd16.tar.gz | |
238319: Sun packages changes.
| -rw-r--r-- | pkg/solaris/Makefile.in | 12 | ||||
| -rw-r--r-- | pkg/solaris/Makefile.targ | 18 | ||||
| -rw-r--r-- | pkg/solaris/SUNWpr/prototype_sparc | 13 |
3 files changed, 20 insertions, 23 deletions
diff --git a/pkg/solaris/Makefile.in b/pkg/solaris/Makefile.in index 89dc443e..eef72a28 100644 --- a/pkg/solaris/Makefile.in +++ b/pkg/solaris/Makefile.in @@ -26,13 +26,10 @@ DIRS = \ PROTO = \ $(ROOT) \ - $(ROOT)/usr \ - $(ROOT)/usr/lib \ $(ROOT)/usr/lib/mps \ + $(ROOT)/usr/lib/mps/cpu/sparcv8plus \ $(ROOT)/usr/lib/mps/sparcv9 \ - $(ROOT)/usr/include \ - $(ROOT)/usr/include/mps \ - $(ROOT)/usr/include/mps/sparcv9 + $(ROOT)/usr/include/mps include $(srcdir)/Makefile.com @@ -49,7 +46,7 @@ clean clobber:: $(RM) awk_pkginfo bld_awk_pkginfo $(RM) -r $(ROOT) -$(ROOT) $(ROOT)/%: +$(ROOT): mkdir -p $@ $(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib @@ -58,6 +55,9 @@ $(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib $(ROOT)/usr/lib/mps: $(ROOT)/usr/lib mkdir -p $@ $(CP) -r $(abs_dist_libdir)/*.so $@ +$(ROOT)/usr/lib/mps/cpu/sparcv8plus: + mkdir -p $@ + $(CP) -r $(abs_dist_libdir)/cpu/sparcv8plus/*.so $@ $(ROOT)/usr/include/mps: $(ROOT)/usr/include mkdir -p $@ $(CP) -r $(abs_dist_includedir)/* $@ diff --git a/pkg/solaris/Makefile.targ b/pkg/solaris/Makefile.targ index 55ca5238..30584b55 100644 --- a/pkg/solaris/Makefile.targ +++ b/pkg/solaris/Makefile.targ @@ -1,5 +1,5 @@ # -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "$Id$" @@ -8,15 +8,7 @@ pkginfo: pkginfo.tmpl ../awk_pkginfo $(RM) $@; nawk -f ../awk_pkginfo $< > $@ -# we need to copy prototype_sparc to current too find copyright in current -prototype: $(srcdir)/prototype_com $(srcdir)/prototype_$(MACH) - cat $(srcdir)/prototype_$(MACH) | sed -e \ -'/^!include[ ][ ]*prototype_com/ r ./prototype_com' \ --e 's/^!include[ ][ ]*prototype_com//g' >prototype - - - -pkg: $(PKGARCHIVE) prototype +pkg: $(PKGARCHIVE) prototype_$(MACH) cp $(srcdir)/prototype_com . cp $(srcdir)/prototype_$(MACH) . cp $(srcdir)/depend . @@ -28,12 +20,6 @@ $(PKGARCHIVE): $(DATAFILES): %: $(srcdir)/../common_files/% $(RM) $@; cp $(srcdir)/../common_files/$@ $@ -#$(MACHDATAFILES): %: $(srcdir)/../common_files/%_$(MACH) -# $(RM) $@; cp $(srcdir)/../common_files/$@_$(MACH) $@ -# -#$(MACHDATAFILES): %: $(srcdir)/%_$(MACH) -# $(RM) $@; cp $(srcdir)/$@_$(MACH) $@ - clobber clean:: -$(RM) $(CLOBBERFILES) $(CLEANFILES) diff --git a/pkg/solaris/SUNWpr/prototype_sparc b/pkg/solaris/SUNWpr/prototype_sparc index 75ffe32b..1630b8f6 100644 --- a/pkg/solaris/SUNWpr/prototype_sparc +++ b/pkg/solaris/SUNWpr/prototype_sparc @@ -1,5 +1,5 @@ # -# Copyright 2002 Sun Microsystems, Inc. All rights reserved. +# Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "$Id$" @@ -34,3 +34,14 @@ d none usr/lib/mps/secv1/cpu 755 root bin d none usr/lib/mps/secv1/cpu/sparcv8plus 755 root bin f none usr/lib/mps/cpu/sparcv8plus/libnspr_flt4.so 755 root bin s none usr/lib/mps/secv1/cpu/sparcv8plus/libnspr_flt4.so=../../../cpu/sparcv8plus/libnspr_flt4.so +s none usr/lib/mps/64=sparcv9 +s none usr/lib/mps/secv1/64=sparcv9 +d none usr/lib/mps/sparcv9 755 root bin +d none usr/lib/mps/secv1/sparcv9 755 root bin +f none usr/lib/mps/sparcv9/libnspr4.so 755 root bin +f none usr/lib/mps/sparcv9/libplc4.so 755 root bin +f none usr/lib/mps/sparcv9/libplds4.so 755 root bin +s none usr/lib/mps/secv1/sparcv9/libnspr4.so=../../sparcv9/libnspr4.so +s none usr/lib/mps/secv1/sparcv9/libplc4.so=../../sparcv9/libplc4.so +s none usr/lib/mps/secv1/sparcv9/libplds4.so=../../sparcv9/libplds4.so + |