238319: Sun packages changes. NSPR_4_5_BRANCH
authorchristophe.ravel.bugs%sun.com
Fri, 22 Oct 2004 05:46:33 +0000
branchNSPR_4_5_BRANCH
changeset 3200 7d4997a62b3891b13de5ff2bbcfa571bb15170f2
parent 3199 4cc6a84e108931025d04206fa561981caa1c8277
child 3201 ff21e178dcc972db35beeeb8e980a947105795f4
push idunknown
push userunknown
push dateunknown
bugs238319
238319: Sun packages changes.
pkg/solaris/Makefile.in
pkg/solaris/SUNWprd/prototype
--- a/pkg/solaris/Makefile.in
+++ b/pkg/solaris/Makefile.in
@@ -38,17 +38,16 @@ endif
 ifeq ($(USE_64), 1)
 ifeq ($(MACH), sparc)
 # Sparc
 	PROTO += $(ROOT)/usr/lib/mps/sparcv9
 else
 # AMD64
 	PROTO += $(ROOT)/usr/lib/mps/amd64
 endif
-	PROTO += $(ROOT)/usr/include/mps/64
 	abs_dist64_libdir = $(abs_dist_libdir)
 	abs_dist32_libdir = $(shell echo $(abs_dist_libdir) | sed -e "s|_64_OPT|_OPT|g" -e "s|_64_DBG|_DBG|g")
 	abs_dist64_includedir = $(abs_dist_includedir)
 	abs_dist32_includedir = $(shell echo $(abs_dist_includedir) | sed -e "s|_64_OPT|_OPT|g" -e "s|_64_DBG|_DBG|g")
 else
 	abs_dist32_libdir = $(abs_dist_libdir)
 	abs_dist64_libdir = $(shell echo $(abs_dist_libdir) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g")
 	abs_dist32_includedir = $(abs_dist_includedir)
@@ -79,11 +78,8 @@ clean clobber::
 	mkdir -p $@
 	$(CP) -r $(abs_dist32_libdir)/*.so $@
 $(ROOT)/usr/lib/mps/cpu/sparcv8plus:
 	mkdir -p $@
 	$(CP) -r $(abs_dist32_libdir)/cpu/sparcv8plus/*.so $@
 $(ROOT)/usr/include/mps:
 	mkdir -p $@
 	$(CP) -r $(abs_dist32_includedir)/* $@
-$(ROOT)/usr/include/mps/64:
-	mkdir -p $@
-	$(CP) -r $(abs_dist64_includedir)/* $@
--- a/pkg/solaris/SUNWprd/prototype
+++ b/pkg/solaris/SUNWprd/prototype
@@ -72,10 +72,8 @@ f none usr/include/mps/prwin16.h 0644 ro
 f none usr/include/mps/plarenas.h 0644 root bin
 f none usr/include/mps/plarena.h 0644 root bin
 f none usr/include/mps/plbase64.h 0644 root bin
 f none usr/include/mps/plerror.h 0644 root bin
 f none usr/include/mps/plgetopt.h 0644 root bin
 f none usr/include/mps/plhash.h 0644 root bin
 f none usr/include/mps/plresolv.h 0644 root bin
 f none usr/include/mps/plstr.h 0644 root bin
-#64#d none usr/include/mps/64 0755 root bin
-#64#f none usr/include/mps/64/prcpucfg.h 0644 root bin