diff options
| -rw-r--r-- | scripts/ChangeLog | 4 | ||||
| -rw-r--r-- | scripts/configure.ac | 21 |
2 files changed, 6 insertions, 19 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 3a398fada0..518e87b867 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2004-02-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Use RTEMS_ENABLE_RPMPREFIX. + 2004-01-28 RTEMS * buildall.in, buildalltar.in, binutils/Makefile.am, diff --git a/scripts/configure.ac b/scripts/configure.ac index 373b40c306..bf39d1f086 100644 --- a/scripts/configure.ac +++ b/scripts/configure.ac @@ -12,24 +12,7 @@ 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_ARG_ENABLE([osversions], -[ --enable-osversions whether to use version numbers in os-tripples], -[case $enable_osversions in -yes ) osversion=RTEMS_API;; -* ) osversion=;; -esac], -[osversion=RTEMS_API]) +RTEMS_ENABLE_RPMPREFIX AC_MSG_CHECKING(for rpm SPECS directory) # Allow users to override RPM_SPECSdir from the environment. @@ -82,7 +65,7 @@ AC_SUBST(BINUTILSVERS) GDBVERS="gdb-${gdb_version}" AC_SUBST(GDBVERS) BSPVERS="${rtems_version}" -AC_SUBST(RTEMS_VERSION) +AC_SUBST(RTEMS_VERSION,${rtems_version}) AC_SUBST(BSPVERS) AC_SUBST(RPM_CPU) AC_SUBST(rpmprefix,$rpmprefix) |