diff options
| author | christophe.ravel.bugs%sun.com <devnull@localhost> | 2004-06-14 23:24:06 +0000 |
|---|---|---|
| committer | christophe.ravel.bugs%sun.com <devnull@localhost> | 2004-06-14 23:24:06 +0000 |
| commit | 64d3d48eaecc261da6e7744b12c5380843b70fac (patch) | |
| tree | 4f685b22e264fb78b8ee0a542f3793874364c5c4 | |
| parent | 996f015f64090fd21b8c708cf66f8fc9c6af2617 (diff) | |
| download | nspr-hg-64d3d48eaecc261da6e7744b12c5380843b70fac.tar.gz | |
238319: Sun packages changes.
| -rw-r--r-- | pkg/solaris/Makefile.com | 3 | ||||
| -rw-r--r-- | pkg/solaris/Makefile.in | 30 |
2 files changed, 13 insertions, 20 deletions
diff --git a/pkg/solaris/Makefile.com b/pkg/solaris/Makefile.com index f364039d..4c22fc45 100644 --- a/pkg/solaris/Makefile.com +++ b/pkg/solaris/Makefile.com @@ -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$" @@ -24,6 +24,7 @@ PRODUCT_VERSION = $(shell grep PR_VERSION $(dist_includedir)/prinit.h \ | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') LN = /usr/bin/ln +CP = /usr/bin/cp CLOBBERFILES = $(FILES) diff --git a/pkg/solaris/Makefile.in b/pkg/solaris/Makefile.in index 4b1c41f9..89dc443e 100644 --- a/pkg/solaris/Makefile.in +++ b/pkg/solaris/Makefile.in @@ -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$" @@ -20,30 +20,24 @@ abs_dist_includedir := $(shell (cd $(dist_includedir);pwd)) cp $< $@ chmod +x $@ -ifeq ($(USE_64), 1) -DIRS = \ - SUNWprx -else DIRS = \ SUNWpr \ SUNWprd -endif PROTO = \ $(ROOT) \ $(ROOT)/usr \ $(ROOT)/usr/lib \ $(ROOT)/usr/lib/mps \ + $(ROOT)/usr/lib/mps/sparcv9 \ $(ROOT)/usr/include \ - $(ROOT)/usr/include/mps - -ifdef USE_64 -PROTO += $(ROOT)/usr/lib/mps/sparcv9 \ + $(ROOT)/usr/include/mps \ $(ROOT)/usr/include/mps/sparcv9 -endif include $(srcdir)/Makefile.com +abs_dist64_libdir = $(shell echo $(abs_dist_libdir) | sed -e "s|_OPT|_64_OPT|g" -e "s|_DBG|_64_DBG|g") + awk_pkginfo: bld_awk_pkginfo ./bld_awk_pkginfo -m $(MACH) -p "$(PRODUCT_VERSION)" -o $@ -v $(PRODUCT_VERSION) @@ -58,14 +52,12 @@ clean clobber:: $(ROOT) $(ROOT)/%: mkdir -p $@ -ifdef USE_64 $(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 + mkdir -p $@ + $(CP) -r $(abs_dist64_libdir)/*.so $@ $(ROOT)/usr/lib/mps: $(ROOT)/usr/lib - $(LN) -sf $(abs_dist_libdir) $@ + mkdir -p $@ + $(CP) -r $(abs_dist_libdir)/*.so $@ $(ROOT)/usr/include/mps: $(ROOT)/usr/include - $(LN) -sf $(abs_dist_includedir) $@ -endif + mkdir -p $@ + $(CP) -r $(abs_dist_includedir)/* $@ |