_bfd_version

Gbp-Pq: Name 135_bfd_version.patch

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index f727ebeb280bb9f1ac312099174745eb7b7a1b34..f9e8a451abaff233fd2443a1307b15e5e20e3d29 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -1085,15 +1085,15 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion
 
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
        @echo "creating $@"
-       @bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
-       bfd_version_string="\"$(VERSION)\"" ;\
+       @bfd_version=`echo "$(VERSION)" | sed -e 's/-.*$$//' | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+       bfd_version_string="\"`echo $(VERSION) | sed -e 's/-.*$$//'`\"" ;\
        bfd_soversion="$(VERSION)" ;\
        bfd_version_package="\"$(PKGVERSION)\"" ;\
        report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
        . $(srcdir)/development.sh ;\
        if test "$$development" = true ; then \
          bfd_version_date=`$(SED) -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
-         bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
+         bfd_version_string="\"`echo $(VERSION) | sed -e 's/-.*$$//'`.$${bfd_version_date}\"" ;\
          bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
        fi ;\
        $(SED) -e "s,@bfd_version@,$$bfd_version," \

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 40608238b7536c7cfa38b7cd5da455dfc30cf2fa..a60b1b7e1c7ab9172794a0979e825e98b0cfb881 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -2202,15 +2202,15 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
 
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
        @echo "creating $@"
-       @bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
-       bfd_version_string="\"$(VERSION)\"" ;\
+       @bfd_version=`echo "$(VERSION)" | sed -e 's/-.*$$//' | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+       bfd_version_string="\"`echo $(VERSION) | sed -e 's/-.*$$//'`\"" ;\
        bfd_soversion="$(VERSION)" ;\
        bfd_version_package="\"$(PKGVERSION)\"" ;\
        report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
        . $(srcdir)/development.sh ;\
        if test "$$development" = true ; then \
          bfd_version_date=`$(SED) -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
-         bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
+         bfd_version_string="\"`echo $(VERSION) | sed -e 's/-.*$$//'`.$${bfd_version_date}\"" ;\
          bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
        fi ;\
        $(SED) -e "s,@bfd_version@,$$bfd_version," \