bfd/

	* Makefile.am (VERSUFFIX_s): Remove.
	(bfdver.h): Replace bfd_version_suffix with bfd_version_package.
	* configure.in: Replace --with-versuffix with --with-pkgversion.
	* version.h: Remove BFD_VERSION_SUFFIX. Update BFD_VERSION_STRING.
	* Makefile.in: Rebuilt.
	* configure: Rebuilt.

	binutils/
	* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
	(REPORT_BUGS_TO): ... this.
	(INCLUDES): Update.
	* Makefile.in: Rebuilt.

	gas/
	* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
	(REPORT_BUGS_TO): ... this.
	(INCLUDES, DEP_INCLUDES): Update.
	* Makefile.in: Rebuilt.

	gprof/
	* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
	(REPORT_BUGS_TO): ... this.
	(VERSUFFIX_s): Remove.
	(INCLUDES): Update.
	* configure.in: Replace --with-versuffix with --with-pkgversion.
	* gprof.c (main): Update version printing.
	* Makefile.in: Rebuilt.
	* configure: Rebuilt.

	ld/
	* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
	(REPORT_BUGS_TO): ... this.
	(INCLUDES): Update.
	* Makefile.in: Rebuilt.

17 files changed, 107 insertions, 81 deletions

diff --git a/ChangeLog.csl b/ChangeLog.csl
index c3c13d905a..71b212f21d 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,41 @@
+2006-09-10  Nathan Sidwell  <nathan@codesourcery.com>
+
+	bfd/
+	* Makefile.am (VERSUFFIX_s): Remove.
+	(bfdver.h): Replace bfd_version_suffix with bfd_version_package.
+	* configure.in: Replace --with-versuffix with --with-pkgversion.
+	* version.h: Remove BFD_VERSION_SUFFIX. Update BFD_VERSION_STRING.
+	* Makefile.in: Rebuilt.
+	* configure: Rebuilt.
+
+	binutils/
+	* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
+	(REPORT_BUGS_TO): ... this.
+	(INCLUDES): Update.
+	* Makefile.in: Rebuilt.
+
+	gas/
+	* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
+	(REPORT_BUGS_TO): ... this.
+	(INCLUDES, DEP_INCLUDES): Update.
+	* Makefile.in: Rebuilt.
+
+	gprof/
+	* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
+	(REPORT_BUGS_TO): ... this.
+	(VERSUFFIX_s): Remove.
+	(INCLUDES): Update.
+	* configure.in: Replace --with-versuffix with --with-pkgversion.
+	* gprof.c (main): Update version printing.
+	* Makefile.in: Rebuilt.
+	* configure: Rebuilt.
+
+	ld/
+	* Makefile.am (REPORT_BUGS_TO_s): Replace with ...
+	(REPORT_BUGS_TO): ... this.
+	(INCLUDES): Update.
+	* Makefile.in: Rebuilt.
+
 2006-09-08  Paul Brook  <paul@codesourcery.com>
 
 	gas/
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 9fc84d069c..712509e65b 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -25,8 +25,6 @@ WARN_CFLAGS = @WARN_CFLAGS@
 NO_WERROR = @NO_WERROR@
 AM_CFLAGS = $(WARN_CFLAGS)
 
-VERSUFFIX_s := "\"@VERSUFFIX@\""
-
 # bfd.h goes here, for now
 BFD_H = bfd.h
 
@@ -937,12 +935,12 @@ bfdver.h: $(srcdir)/version.h $(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_suffix=$(VERSUFFIX_s) ;\
+	bfd_version_package="\"$(PKGVERSION)\"" ;\
 	if test "x$(RELEASE)" = x ; then \
 	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
 	  bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\
 	fi ;\
-	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_suffix@/$$bfd_version_suffix/" < $(srcdir)/version.h > $@
+	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@
 
 # What appears below is generated by a hacked mkdep using gcc -MM.
 
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 5bbf294be9..7d32b76fc4 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -186,7 +186,7 @@ TDEFINES = @TDEFINES@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-VERSUFFIX = @VERSUFFIX@
+PKGVERSION = @PKGVERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
 WIN32LDFLAGS = @WIN32LDFLAGS@
 WIN32LIBADD = @WIN32LIBADD@
@@ -262,7 +262,6 @@ SUBDIRS = doc po
 bfddocdir = doc
 bfdlib_LTLIBRARIES = libbfd.la
 AM_CFLAGS = $(WARN_CFLAGS)
-VERSUFFIX_s := "\"@VERSUFFIX@\""
 
 # bfd.h goes here, for now
 BFD_H = bfd.h
@@ -1503,12 +1502,12 @@ bfdver.h: $(srcdir)/version.h $(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_suffix=$(VERSUFFIX_s) ;\
+	bfd_version_package="\"$(PKGVERSION)\"" ;\
 	if test "x$(RELEASE)" = x ; then \
 	  bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
 	  bfd_version_string="\"$(VERSION) $${bfd_version_date}\"" ;\
 	fi ;\
-	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_suffix@/$$bfd_version_suffix/" < $(srcdir)/version.h > $@
+	sed -e "s/@bfd_version@/$$bfd_version/" -e "s/@bfd_version_string@/$$bfd_version_string/" -e "s/@bfd_version_package@/$$bfd_version_package/" < $(srcdir)/version.h > $@
 
 # What appears below is generated by a hacked mkdep using gcc -MM.
 
diff --git a/bfd/configure b/bfd/configure
index 203ecfa941..6e8d29c1fb 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL VERSUFFIX WARN_CFLAGS NO_WERROR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_LIBBFD_TRUE INSTALL_LIBBFD_FALSE host_noncanonical target_noncanonical bfdlibdir bfdincludedir CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l HDEFINES BFD_HOST_64BIT_LONG BFD_HOST_LONG_LONG BFD_HOST_64_BIT_DEFINED BFD_HOST_64_BIT BFD_HOST_U_64_BIT CC_FOR_BUILD EXEEXT_FOR_BUILD COREFILE COREFLAG WIN32LDFLAGS WIN32LIBADD TDEFINES wordsize bfd_libs all_backends bfd_backends bfd_machines bfd_default_target_size bfd_file_ptr bfd_ufile_ptr tdefaults datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE AR ac_ct_AR RANLIB ac_ct_RANLIB LN_S LIBTOOL PKGVERSION WARN_CFLAGS NO_WERROR MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INSTALL_LIBBFD_TRUE INSTALL_LIBBFD_FALSE host_noncanonical target_noncanonical bfdlibdir bfdincludedir CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l HDEFINES BFD_HOST_64BIT_LONG BFD_HOST_LONG_LONG BFD_HOST_64_BIT_DEFINED BFD_HOST_64_BIT BFD_HOST_U_64_BIT CC_FOR_BUILD EXEEXT_FOR_BUILD COREFILE COREFLAG WIN32LDFLAGS WIN32LIBADD TDEFINES wordsize bfd_libs all_backends bfd_backends bfd_machines bfd_default_target_size bfd_file_ptr bfd_ufile_ptr tdefaults datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -873,7 +873,7 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-pic              try to use only PIC/non-PIC objects default=use both
   --with-mmap             try using mmap for BFD input files if available
-  --with-versuffix=SFX    Append SFX to the version string
+  --with-pkgversion=PKG   Add PKG to the version string
   --with-included-gettext use the GNU gettext library included here
 
 Some influential environment variables:
@@ -4387,21 +4387,20 @@ _ACEOF
 
 fi
 
-# The trailing component of the string reported as the version number
-# by gdb. For an official FSF release, it is empty.
+# Package version.  For an official FSF release, it is empty.
 
-# Check whether --with-versuffix or --without-versuffix was given.
-if test "${with_versuffix+set}" = set; then
-  withval="$with_versuffix"
+# Check whether --with-pkgversion or --without-pkgversion was given.
+if test "${with_pkgversion+set}" = set; then
+  withval="$with_pkgversion"
   case "$withval" in
-    yes) { { echo "$as_me:$LINENO: error: version suffix not specified" >&5
-echo "$as_me: error: version suffix not specified" >&2;}
+    yes) { { echo "$as_me:$LINENO: error: package version not specified" >&5
+echo "$as_me: error: package version not specified" >&2;}
    { (exit 1); exit 1; }; } ;;
-    no)  VERSUFFIX=" (CodeSourcery Unofficial)" ;;
-    *)   VERSUFFIX=" ($withval)" ;;
+    no)  PKGVERSION= ;;
+    *)   PKGVERSION="($withval) " ;;
    esac
 else
-  VERSUFFIX=
+  PKGVERSION=
 
 fi;
 
@@ -15263,7 +15262,7 @@ s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@LN_S@,$LN_S,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@VERSUFFIX@,$VERSUFFIX,;t t
+s,@PKGVERSION@,$PKGVERSION,;t t
 s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
 s,@NO_WERROR@,$NO_WERROR,;t t
 s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
diff --git a/bfd/configure.in b/bfd/configure.in
index f110727b41..dd2cb7309f 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -63,19 +63,18 @@ if test $use_secureplt = true; then
     [Define if we should default to creating read-only plt entries])
 fi
 
-# The trailing component of the string reported as the version number
-# by gdb. For an official FSF release, it is empty.
-AC_ARG_WITH(versuffix,
-  AS_HELP_STRING([--with-versuffix=SFX],
-                 [Append SFX to the version string]),
+# Package version.  For an official FSF release, it is empty.
+AC_ARG_WITH(pkgversion,
+  AS_HELP_STRING([--with-pkgversion=PKG],
+                 [Add PKG to the version string]),
   [case "$withval" in
-    yes) AC_MSG_ERROR([version suffix not specified]) ;;
-    no)  VERSUFFIX=" (CodeSourcery Unofficial)" ;;
-    *)   VERSUFFIX=" ($withval)" ;;
+    yes) AC_MSG_ERROR([package version not specified]) ;;
+    no)  PKGVERSION= ;;
+    *)   PKGVERSION="($withval) " ;;
    esac],
-  VERSUFFIX=
+  PKGVERSION=
 )
-AC_SUBST(VERSUFFIX)   
+AC_SUBST(PKGVERSION)
 
 AM_BINUTILS_WARNINGS
 
diff --git a/bfd/version.h b/bfd/version.h
index 004c17cc86..3465594426 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,3 @@
 #define BFD_VERSION_DATE 20060623
 #define BFD_VERSION @bfd_version@
-#define BFD_VERSION_SUFFIX @bfd_version_suffix@
-#define BFD_VERSION_STRING @bfd_version_string@ BFD_VERSION_SUFFIX
+#define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 2a3ad1e9dc..f4e1745db6 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -72,14 +72,14 @@ INCDIR	= $(BASEDIR)/include
 
 MKDEP = gcc -MM
 
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
 
 INCLUDES = -D_GNU_SOURCE \
 	 -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
 	 @HDEFINES@ \
 	 -I$(srcdir)/../intl -I../intl \
 	 -DLOCALEDIR="\"$(datadir)/locale\"" \
-	 -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	 $(REPORT_BUGS_TO) \
 	 -Dbin_dummy_emulation=$(EMULATION_VECTOR)
 
 HFILES = \
@@ -121,7 +121,7 @@ LIBIBERTY = ../libiberty/libiberty.a
 .PHONY: install-html install-html-am install-html-recursive
 
 install-html:	install-html-recursive	
-	
+
 install-html-recursive:
 	@failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index e0e3b5289b..f17fc3b3d5 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -401,13 +401,13 @@ BASEDIR = $(srcdir)/..
 BFDDIR = $(BASEDIR)/bfd
 INCDIR = $(BASEDIR)/include
 MKDEP = gcc -MM
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
 INCLUDES = -D_GNU_SOURCE \
 	 -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
 	 @HDEFINES@ \
 	 -I$(srcdir)/../intl -I../intl \
 	 -DLOCALEDIR="\"$(datadir)/locale\"" \
-	 -DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	 $(REPORT_BUGS_TO) \
 	 -Dbin_dummy_emulation=$(EMULATION_VECTOR)
 
 HFILES = \
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 1e34499d03..f52854a092 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -459,7 +459,7 @@ BASEDIR = $(srcdir)/..
 BFDDIR = $(BASEDIR)/bfd
 INCDIR = $(BASEDIR)/include
 
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
 
 # This is the variable actually used when we compile.
 # Specify the directories to be searched for header files.
@@ -468,7 +468,7 @@ REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
 # subdirectory rather than in the source directory.
 INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
 	-I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl \
-	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""
 
 # This should be parallel to INCLUDES, but should replace $(srcdir)
@@ -477,7 +477,7 @@ INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
 # in a subdirectory.
 DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config \
 	-I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl  \
-	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""
 
 DEP_FLAGS = -DOBJ_MAYBE_ELF \
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 437b6aca5f..729d923e9c 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -676,7 +676,7 @@ DISTCLEANFILES = targ-cpu.h obj-format.h targ-env.h itbl-cpu.h cgen-desc.h
 BASEDIR = $(srcdir)/..
 BFDDIR = $(BASEDIR)/bfd
 INCDIR = $(BASEDIR)/include
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
 
 # This is the variable actually used when we compile.
 # Specify the directories to be searched for header files.
@@ -685,7 +685,7 @@ REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
 # subdirectory rather than in the source directory.
 INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
 	-I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl \
-	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""
 
 
@@ -695,7 +695,7 @@ INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
 # in a subdirectory.
 DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config \
 	-I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl  \
-	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""
 
 DEP_FLAGS = -DOBJ_MAYBE_ELF \
diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index 02c775310d..e0083f3c59 100644
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -16,13 +16,12 @@ AM_CFLAGS = $(WARN_CFLAGS)
 
 MKDEP = gcc -MM
 
-VERSUFFIX_s := "\"@VERSUFFIX@\""
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO"" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
 
 INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include \
 	-I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I.  \
 	-DVERSUFFIX=$(VERSUFFIX_s) \
-	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""
 
 bin_PROGRAMS = gprof
diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index a26e37e1b4..e160830797 100644
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -242,12 +242,11 @@ BFDDIR = $(BASEDIR)/bfd
 INCDIR = $(BASEDIR)/include
 AM_CFLAGS = $(WARN_CFLAGS)
 MKDEP = gcc -MM
-VERSUFFIX_s := "\"@VERSUFFIX@\""
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
 INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include \
 	-I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I.  \
-	-DVERSUFFIX=$(VERSUFFIX_s) \
-	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	-DPKGVERSION="\"$(PKGVERSION)\"" \
+	$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""
 
 sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \
diff --git a/gprof/configure b/gprof/configure
index b998acd444..00fbb637a5 100755
--- a/gprof/configure
+++ b/gprof/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL VERSUFFIX REPORT_BUGS_TO CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WARN_CFLAGS NO_WERROR datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S RANLIB ac_ct_RANLIB LIBTOOL PKGVERSION REPORT_BUGS_TO CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WARN_CFLAGS NO_WERROR datarootdir docdir htmldir LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -867,7 +867,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-pic              try to use only PIC/non-PIC objects default=use both
-  --with-versuffix=SFX    Append SFX to the version string
+  --with-pkgversion=PKG   Add PKG to the version string
   --with-bugurl=URL       Direct users to URL to report a bug
   --with-included-gettext use the GNU gettext library included here
 
@@ -4155,26 +4155,24 @@ exec 5>>./config.log
 
 
 
-# The trailing component of the string reported as the version number
-# by gdb. For an official FSF release, it is empty.
+# Package version.  For an official FSF release, it is empty.
 
-# Check whether --with-versuffix or --without-versuffix was given.
-if test "${with_versuffix+set}" = set; then
-  withval="$with_versuffix"
+# Check whether --with-pkgversion or --without-pkgversion was given.
+if test "${with_pkgversion+set}" = set; then
+  withval="$with_pkgversion"
   case "$withval" in
-    yes) { { echo "$as_me:$LINENO: error: version suffix not specified" >&5
-echo "$as_me: error: version suffix not specified" >&2;}
+    yes) { { echo "$as_me:$LINENO: error: package version not specified" >&5
+echo "$as_me: error: package version not specified" >&2;}
    { (exit 1); exit 1; }; } ;;
-    no)  VERSUFFIX=" (CodeSourcery Unofficial)" ;;
-    *)   VERSUFFIX=" ($withval)" ;;
+    no)  PKGVERSION= ;;
+    *)   PKGVERSION="($withval) " ;;
    esac
 else
-  VERSUFFIX=
+  PKGVERSION=
 
 fi;
 
 
-
 # The location to which bugs should be reported.
 
 # Check whether --with-bugurl or --without-bugurl was given.
@@ -9254,7 +9252,7 @@ s,@LN_S@,$LN_S,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
-s,@VERSUFFIX@,$VERSUFFIX,;t t
+s,@PKGVERSION@,$PKGVERSION,;t t
 s,@REPORT_BUGS_TO@,$REPORT_BUGS_TO,;t t
 s,@CPP@,$CPP,;t t
 s,@EGREP@,$EGREP,;t t
diff --git a/gprof/configure.in b/gprof/configure.in
index aeb6cacad6..dbed06c00f 100644
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -13,20 +13,18 @@ AM_INIT_AUTOMAKE(gprof, ${BFD_VERSION})
 
 AM_PROG_LIBTOOL
 
-# The trailing component of the string reported as the version number
-# by gdb. For an official FSF release, it is empty.
-AC_ARG_WITH(versuffix,
-  AS_HELP_STRING([--with-versuffix=SFX],
-                 [Append SFX to the version string]),
+# Package version.  For an official FSF release, it is empty.
+AC_ARG_WITH(pkgversion,
+  AS_HELP_STRING([--with-pkgversion=PKG],
+                 [Add PKG to the version string]),
   [case "$withval" in
-    yes) AC_MSG_ERROR([version suffix not specified]) ;;
-    no)  VERSUFFIX=" (CodeSourcery Unofficial)" ;;
-    *)   VERSUFFIX=" ($withval)" ;;
+    yes) AC_MSG_ERROR([package version not specified]) ;;
+    no)  PKGVERSION= ;;
+    *)   PKGVERSION="($withval) " ;;
    esac],
-  VERSUFFIX=
+  PKGVERSION=
 )
-AC_SUBST(VERSUFFIX)   
-
+AC_SUBST(PKGVERSION)
 
 # The location to which bugs should be reported.
 AC_ARG_WITH(bugurl,
diff --git a/gprof/gprof.c b/gprof/gprof.c
index bc15215645..2e09ab380d 100644
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -411,7 +411,7 @@ main (int argc, char **argv)
 	  break;
 	case 'v':
 	  /* This output is intended to follow the GNU standards document.  */
-	  printf (_("GNU gprof %s\n"), VERSION VERSUFFIX);
+	  printf (_("GNU gprof %s\n"), PKGVERSION VERSION);
 	  printf (_("Based on BSD gprof, copyright 1983 Regents of the University of California.\n"));
 	  printf (_("\
 This program is free software.  This program has absolutely no warranty.\n"));
diff --git a/ld/Makefile.am b/ld/Makefile.am
index 28be7d3510..16efcfe5a6 100644
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -100,11 +100,11 @@ man_MANS = ld.1
 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
 TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
 
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
 
 INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
 	-I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) \
-	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""
 
 BFDLIB = ../bfd/libbfd.la
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 80d27f86c2..846af42949 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -329,10 +329,10 @@ noinst_TEXINFOS = ldint.texinfo
 man_MANS = ld.1
 AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
 TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
-REPORT_BUGS_TO_s := "\"@REPORT_BUGS_TO@\""
+REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO"" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
 INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
 	-I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) \
-	-DREPORT_BUGS_TO=$(REPORT_BUGS_TO_s) \
+	$(REPORT_BUGS_TO) \
 	-DLOCALEDIR="\"$(datadir)/locale\""
 
 BFDLIB = ../bfd/libbfd.la