2003-09-02 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* binutils/mkspec.in: Use ',' as sed-delimiter for %{rpmprefix}.
	* common/common.add.in: Add _infodir, _mandir, rpmprefix, rpmgroup.
	* configure.ac: Add --enable-pkgprefix, rpmgroup.

4 files changed, 37 insertions, 6 deletions

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 5ac4c92346..8436805f4a 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,15 +1,25 @@
 2003-09-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
-	* base-g77.add, base-gcc.add, base-gcj.add, base-gnat.add,
-	target-c++.add, target-g77.add, target-gcc.add, target-gcj.add,
-	target-gnat.add, target-objc.add
+	* binutils/mkspec.in: Use ',' as sed-delimiter for %{rpmprefix}.
+	* common/common.add.in: Add _infodir, _mandir, rpmprefix, rpmgroup.
+	* configure.ac: Add --enable-pkgprefix, rpmgroup.
+
+2003-09-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* gcc3newlib/base-g77.add, gcc3newlib/base-gcc.add, 
+	gcc3newlib/base-gcj.add, gcc3newlib/base-gnat.add,
+	gcc3newlib/target-c++.add, gcc3newlib/target-g77.add,
+        gcc3newlib/target-gcc.add, gcc3newlib/target-gcj.add,
+	gcc3newlib/target-gnat.add, gcc3newlib/target-objc.add:
 	Add support for %{rpmprefix}, %{rpmgroup}.
 	Use %{gcc_target and %{gcc_version}.
 	Remove "Provides:".
-	* gccnewlib.add: Ditto.
+	* gcc3newlib/gccnewlib.add: Ditto.
 	Correct setting up _gcj.
 	Explicitly build c++filt for gcc >= 3.3.
-	* mkspec.in: Add support for %{rpmprefix}, %{rpmgroup}.
+	* gcc3newlib/mkspec.in: Add support for %{rpmprefix}, %{rpmgroup}.
+	* binutils/mkspec.in: Use ',' as sed-delimiter for %{rpmprefix}.
+	* common/common.add.in: Add _infodir, _mandir, rpmprefix, rpmgroup.
 
 2003-09-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
diff --git a/scripts/binutils/mkspec.in b/scripts/binutils/mkspec.in
index ea6dd64226..bbba80989b 100644
--- a/scripts/binutils/mkspec.in
+++ b/scripts/binutils/mkspec.in
@@ -57,7 +57,7 @@ sed -e "s%@Release\@%${binutils_rpm_release}%g" \
     -e "s,@rpm_build_root\@,${rpm_build_root},g" \
     -e "s%@target_alias\@%${target_alias}%g" \
     -e "s%@prefix\@%@prefix@%g" \
-    -e "s%@rpmprefix\@%@rpmprefix@%g" \
+    -e "s,@rpmprefix\@,@rpmprefix@,g" \
     -e "s%@rpmgroup\@%@rpmgroup@%g" \
     -e "s%@binutils_version\@%${binutils_version}%g" \
     -e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \
diff --git a/scripts/common/common.add.in b/scripts/common/common.add.in
index e3580a6af8..9365c88138 100644
--- a/scripts/common/common.add.in
+++ b/scripts/common/common.add.in
@@ -5,6 +5,14 @@
 #
 
 %define	_prefix			@prefix@
+%if "%{_prefix}" != "/usr"
+%define _infodir		%{_prefix}/info
+%define _mandir			%{_prefix}/man
+%endif
+
+%define rpmprefix		@rpmprefix@
+%define rpmgroup		@rpmgroup@
+
 %define _defaultbuildroot 	%{_tmppath}/%{name}-%{version}-root
 %ifos cygwin cygwin32
 %define _exeext .exe
diff --git a/scripts/configure.ac b/scripts/configure.ac
index 8fc36d2ce0..7ce93f907f 100644
--- a/scripts/configure.ac
+++ b/scripts/configure.ac
@@ -12,6 +12,17 @@ AC_CANONICAL_HOST
 test -f ./setup.cache || cp ${srcdir}/setup.def ./setup.cache
 . ./setup.cache
 
+AC_ARG_ENABLE([rpmprefix],
+[  --enable-rpmprefix=<rpmprefix>      prefix rpms],
+[case $enable_rpmprefix in
+yes ) rpmprefix="rtems-"]RTEMS_API["-";;
+no ) rpmprefix="%{nil}";;
+* ) AS_IF([test -z "$enable_rpmprefix"],
+      [rpmprefix="%{nil}"],
+      [rpmprefix="$enable_rpmprefix"]);;
+esac],
+[rpmprefix="rtems-"]RTEMS_API["-"])
+
 AC_MSG_CHECKING(for rpm SPECS directory)
 # Allow users to override RPM_SPECSdir from the environment.
 if test -z "$RPM_SPECSdir" ;
@@ -66,6 +77,8 @@ BSPVERS="${rtems_version}"
 AC_SUBST(RTEMS_VERSION)
 AC_SUBST(BSPVERS)
 AC_SUBST(RPM_CPU)
+AC_SUBST(rpmprefix,$rpmprefix)
+AC_SUBST(rpmgroup,[Rtems/][RTEMS_API])
 
 AC_CONFIG_FILES([Makefile
 binutils/Makefile