X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src-release.sh;h=64fa4c2120bfb81a02d99bc4e73b8b10ea6e8592;hb=7989954c57444ef2a5963bb2bb0fae4652b846a6;hp=558b012897f16326402df52773f6042c32c34c42;hpb=92c695a14f6a5a24b177e89624c13d7dbcbf9e1f;p=binutils-gdb.git

diff --git a/src-release.sh b/src-release.sh
index 558b012897f..64fa4c2120b 100755
--- a/src-release.sh
+++ b/src-release.sh
@@ -42,7 +42,7 @@ DEVO_SUPPORT="README Makefile.in configure configure.ac \
 	COPYING COPYING.LIB install-sh config-ml.in symlink-tree \
 	mkinstalldirs ltmain.sh missing ylwrap \
 	libtool.m4 ltsugar.m4 ltversion.m4 ltoptions.m4 \
-	Makefile.def Makefile.tpl src-release config.rpath \
+	Makefile.def Makefile.tpl src-release.sh config.rpath \
 	ChangeLog MAINTAINERS README-maintainer-mode \
 	lt~obsolete.m4 ltgcc.m4 depcomp mkdep compile \
 	COPYING3 COPYING3.LIB"
@@ -60,7 +60,7 @@ getver()
 	bfd/configure --version | sed -n -e '1s,.* ,,p'
     elif test -f $tool/common/create-version.sh; then
 	$tool/common/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp
-	cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-cvs$//'
+	cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-git$//'
         rm -f VER.tmp
     elif test -f $tool/version.in; then
 	head -1 $tool/version.in
@@ -83,9 +83,7 @@ do_proto_toplev()
 	<Makefile.in >tmp
     mv -f tmp Makefile.in
     #
-    ./configure --target=i386-pc-linux-gnu \
-	--with-target-subdir=. \
-	--disable-multilib
+    ./configure --target=i386-pc-linux-gnu
     $MAKE configure-host configure-target \
 	ALL_GCC="" ALL_GCC_C="" ALL_GCC_CXX="" \
 	CC_FOR_TARGET="$CC" CXX_FOR_TARGET="$CXX"
@@ -246,7 +244,8 @@ tar_compress()
     tool=$2
     support_files=$3
     compressors=$4
-    ver=$(getver $tool)
+    verdir=${5:-$tool}
+    ver=$(getver $verdir)
     do_proto_toplev $package $ver $tool "$support_files"
     do_md5sum
     do_tar $package $ver
@@ -297,13 +296,13 @@ gdb_release()
 }
 
 # Corresponding to the CVS "sim" module.
-SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in makefile.vms zlib"
+SIM_SUPPORT_DIRS="bfd opcodes libiberty include intl gdb/version.in gdb/common/create-version.sh makefile.vms zlib"
 sim_release()
 {
     compressors=$1
     package=sim
     tool=sim
-    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors"
+    tar_compress $package $tool "$SIM_SUPPORT_DIRS" "$compressors" gdb
 }
 
 usage()