From 4c671a6d69131f4d18628c1203d5c0ae09760798 Mon Sep 17 00:00:00 2001
From: "wtc%netscape.com"
 <wtc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 13 Feb 2003 01:57:42 +0000
Subject: [PATCH] Bug 189501: use the PR_VERSION macro in prinit.h for version
 info.  The patch is contributed by Kirk Erickson <kirk.erickson@sun.com>.

git-svn-id: svn://10.0.0.236/trunk@137741 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/nsprpub/pkg/linux/Makefile.in | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/mozilla/nsprpub/pkg/linux/Makefile.in b/mozilla/nsprpub/pkg/linux/Makefile.in
index bea95180a13..b6a4589624b 100644
--- a/mozilla/nsprpub/pkg/linux/Makefile.in
+++ b/mozilla/nsprpub/pkg/linux/Makefile.in
@@ -2,7 +2,7 @@
 # Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"$Id: Makefile.in,v 1.1 2003-02-04 01:45:28 wtc%netscape.com Exp $"
+#ident	"$Id: Makefile.in,v 1.2 2003-02-13 01:57:42 wtc%netscape.com Exp $"
 #
 
 MOD_DEPTH = ../..
@@ -12,35 +12,33 @@ VPATH	    = @srcdir@
 
 NAME        = sun-nspr
 RELEASE     = 1
-VERSION     = $(MOD_MAJOR_VERSION).$(MOD_MINOR_VERSION).$(MOD_REVISION_VERSION)
-SOURCE      = $(NAME)-$(VERSION).tar.gz
-RPM         = $(NAME)-$(VERSION)-$(RELEASE).i386.rpm
-SRPM        = $(NAME)-$(VERSION)-$(RELEASE).src.rpm
 TOPDIR      = /usr/src/redhat
+VERSION     = `grep PR_VERSION $(dist_includedir)/prinit.h \
+                  | sed -e 's/"$$//' -e 's/.*"//' -e 's/ .*//'`
 
 include $(MOD_DEPTH)/config/autoconf.mk
 
-all::
 publish:
 	$(MAKE) clean
 	mkdir -p usr/lib/mps
 	cp -L $(MOD_DEPTH)/dist/lib/* usr/lib/mps
 	mkdir -p usr/include/mps
 	cp -Lr $(MOD_DEPTH)/dist/include/* usr/include/mps
-	tar czvf $(SOURCE) usr
+	tar czvf $(NAME)-$(VERSION).tar.gz usr
 	echo "%define name $(NAME)" >$(NAME).spec
 	echo "%define version $(VERSION)" >>$(NAME).spec
 	echo "%define release $(RELEASE)" >>$(NAME).spec
 
 	cat $(srcdir)/$(NAME).spec >>$(NAME).spec
-	cp $(SOURCE) $(TOPDIR)/SOURCES
+	cp $(NAME)-$(VERSION).tar.gz $(TOPDIR)/SOURCES
 	rpm -ba $(NAME).spec
 	if [ ! -d RPMS ] ; then mkdir -p RPMS ; fi
 	if [ ! -d SRPMS ] ; then mkdir -p SRPMS ; fi
-	cp -v $(TOPDIR)/RPMS/i386/$(NAME)-* RPMS
-	cp -v $(TOPDIR)/SRPMS/$(NAME)-* SRPMS
+	cp -v $(TOPDIR)/RPMS/i386/$(NAME)-$(VERSION)-* RPMS
+	cp -v $(TOPDIR)/RPMS/i386/$(NAME)-devel-$(VERSION)-* RPMS
+	cp -v $(TOPDIR)/SRPMS/$(NAME)-$(VERSION)-* SRPMS
 
 clean:
 	rm -rf $(TOPDIR)/BUILD/$(NAME)
 	rm -rf RPMS SRPMS usr
-	rm -f $(SOURCE)
+	rm -f $(NAME)-$(VERSION).tar.gz