summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristophe.ravel.bugs%sun.com <devnull@localhost>2004-06-10 18:28:58 +0000
committerchristophe.ravel.bugs%sun.com <devnull@localhost>2004-06-10 18:28:58 +0000
commit7f1f65270ae575e23dd8d7d77d91156015782d6e (patch)
treeeb8cb611e46bf6faf194217e955e23bec930f111
parent026b1046dd931cd285711d4db76b66a8479e0e13 (diff)
downloadnspr-hg-7f1f65270ae575e23dd8d7d77d91156015782d6e.tar.gz
238319: Sun packages changes.
-rw-r--r--pkg/solaris/Makefile.in7
-rw-r--r--pkg/solaris/SUNWpr/prototype_com9
-rw-r--r--pkg/solaris/SUNWpr/prototype_sparc5
-rw-r--r--pkg/solaris/SUNWprx/prototype_sparc11
4 files changed, 21 insertions, 11 deletions
diff --git a/pkg/solaris/Makefile.in b/pkg/solaris/Makefile.in
index ced4c85d..4b1c41f9 100644
--- a/pkg/solaris/Makefile.in
+++ b/pkg/solaris/Makefile.in
@@ -34,12 +34,11 @@ PROTO = \
$(ROOT)/usr \
$(ROOT)/usr/lib \
$(ROOT)/usr/lib/mps \
- $(ROOT)/usr/lib/mps/secv1 \
$(ROOT)/usr/include \
$(ROOT)/usr/include/mps
ifdef USE_64
-PROTO += $(ROOT)/usr/lib/mps/secv1/sparcv9 \
+PROTO += $(ROOT)/usr/lib/mps/sparcv9 \
$(ROOT)/usr/include/mps/sparcv9
endif
@@ -60,12 +59,12 @@ $(ROOT) $(ROOT)/%:
mkdir -p $@
ifdef USE_64
-$(ROOT)/usr/lib/mps/secv1/sparcv9: $(ROOT)/usr/lib
+$(ROOT)/usr/lib/mps/sparcv9: $(ROOT)/usr/lib
$(LN) -sf $(abs_dist_libdir) $@
$(ROOT)/usr/include/mps/sparcv9: $(ROOT)/usr/include
$(LN) -sf $(abs_dist_includedir) $@
else
-$(ROOT)/usr/lib/mps/secv1: $(ROOT)/usr/lib
+$(ROOT)/usr/lib/mps: $(ROOT)/usr/lib
$(LN) -sf $(abs_dist_libdir) $@
$(ROOT)/usr/include/mps: $(ROOT)/usr/include
$(LN) -sf $(abs_dist_includedir) $@
diff --git a/pkg/solaris/SUNWpr/prototype_com b/pkg/solaris/SUNWpr/prototype_com
index 0a0d72cb..4e4e3f22 100644
--- a/pkg/solaris/SUNWpr/prototype_com
+++ b/pkg/solaris/SUNWpr/prototype_com
@@ -27,6 +27,9 @@ d none usr 755 root sys
d none usr/lib 755 root bin
d none usr/lib/mps 755 root bin
d none usr/lib/mps/secv1 755 root bin
-f none usr/lib/mps/secv1/libnspr4.so 755 root bin
-f none usr/lib/mps/secv1/libplc4.so 755 root bin
-f none usr/lib/mps/secv1/libplds4.so 755 root bin
+f none usr/lib/mps/libnspr4.so 755 root bin
+f none usr/lib/mps/libplc4.so 755 root bin
+f none usr/lib/mps/libplds4.so 755 root bin
+s none usr/lib/mps/secv1/libnspr4.so=../libnspr4.so
+s none usr/lib/mps/secv1/libplc4.so=../libplc4.so
+s none usr/lib/mps/secv1/libplds4.so=../libplds4.so
diff --git a/pkg/solaris/SUNWpr/prototype_sparc b/pkg/solaris/SUNWpr/prototype_sparc
index 3aa74082..75ffe32b 100644
--- a/pkg/solaris/SUNWpr/prototype_sparc
+++ b/pkg/solaris/SUNWpr/prototype_sparc
@@ -28,6 +28,9 @@
#
# SUNWpr
#
+d none usr/lib/mps/cpu 755 root bin
+d none usr/lib/mps/cpu/sparcv8plus 755 root bin
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/secv1/cpu/sparcv8plus/libnspr_flt4.so 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
diff --git a/pkg/solaris/SUNWprx/prototype_sparc b/pkg/solaris/SUNWprx/prototype_sparc
index 4d6baa13..f9c33833 100644
--- a/pkg/solaris/SUNWprx/prototype_sparc
+++ b/pkg/solaris/SUNWprx/prototype_sparc
@@ -28,8 +28,13 @@
#
# SUNWprx
#
+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/secv1/sparcv9/libnspr4.so 755 root bin
-f none usr/lib/mps/secv1/sparcv9/libplc4.so 755 root bin
-f none usr/lib/mps/secv1/sparcv9/libplds4.so 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