diff options
| author | wtc%netscape.com <devnull@localhost> | 2003-02-26 23:53:44 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2003-02-26 23:53:44 +0000 |
| commit | 3c04c90148d52bc544aac8ab8649610b0ec513c1 (patch) | |
| tree | 7e3157de261b92751bd73e04c6f28170f6961ae7 /pkg/solaris | |
| parent | 2388aa960834d6772d86233e07e840acfde2c7c0 (diff) | |
| download | nspr-hg-3c04c90148d52bc544aac8ab8649610b0ec513c1.tar.gz | |
Sync up the NSPRPUB_PRE_4_2_CLIENT_BRANCH with the trunk.
Diffstat (limited to 'pkg/solaris')
| -rw-r--r-- | pkg/solaris/Makefile.com | 6 | ||||
| -rw-r--r-- | pkg/solaris/Makefile.targ | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/pkg/solaris/Makefile.com b/pkg/solaris/Makefile.com index eb2b979f..523460be 100644 --- a/pkg/solaris/Makefile.com +++ b/pkg/solaris/Makefile.com @@ -16,11 +16,13 @@ endif PKGARCHIVE = $(dist_libdir)/pkgarchive DATAFILES = copyright -FILES = $(DATAFILES) pkginfo +FILES = $(DATAFILES) pkginfo prototype PACKAGE = $(shell basename `pwd`) -PRODUCT_VERSION = $(MOD_VERSION).$(MOD_MINOR).$(MOD_PATCH) +PRODUCT_VERSION = $(shell grep PR_VERSION $(dist_includedir)/prinit.h \ + | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//') + LN = /usr/bin/ln CLOBBERFILES = $(FILES) diff --git a/pkg/solaris/Makefile.targ b/pkg/solaris/Makefile.targ index daf327bd..55ca5238 100644 --- a/pkg/solaris/Makefile.targ +++ b/pkg/solaris/Makefile.targ @@ -9,7 +9,14 @@ pkginfo: pkginfo.tmpl ../awk_pkginfo $(RM) $@; nawk -f ../awk_pkginfo $< > $@ # we need to copy prototype_sparc to current too find copyright in current -pkg: $(PKGARCHIVE) +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 cp $(srcdir)/prototype_com . cp $(srcdir)/prototype_$(MACH) . cp $(srcdir)/depend . |