From abb51c4da36245a7785dbd5cbdc7347346b6e537 Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Fri, 25 Jul 2003 20:01:47 +0000
Subject: [PATCH] Added another regex to the version number munging in fix_ver
 Rearranged the internals of generic_pack so it will actually do the right
 thing with 'shortroot' (oops :))

---
 buildpkg.packaging.irix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/buildpkg.packaging.irix b/buildpkg.packaging.irix
index 28faaca..67502a8 100644
--- a/buildpkg.packaging.irix
+++ b/buildpkg.packaging.irix
@@ -44,7 +44,7 @@ indent12="           "
 # Removes any '.' and '-' characters from a version string
 fix_ver()
 {
-    local ver=`echo $1 | $SED -e 's/\.//g' -e 's/-//g'`
+    local ver=`echo $1 | $SED -e 's/\.//g' -e 's/-//g' -e 's/[a-zA-Z]//g'`
     echo $ver
 }
 # spec_header()
@@ -276,16 +276,18 @@ generic_pack()
 {   
     clean meta
 
-    setdir stage
-    create_idb
-    create_spec
-    
     # Verify if $1 is defined
     local arg1=${1-'x'}
     case $arg1 in 
-	'x')		make_dist # arg1 was undefined
+	'x')		setdir $stagedir$topinstalldir
+			create_idb
+			create_spec
+			make_dist 
 			;;
-	'shortroot')	make_dist shortroot
+	'shortroot')	setdir stage
+			create_idb
+			create_spec
+			make_dist shortroot
 			;;
 	'*')		error $E_BAD_ARGS generic_pack
 			;;