diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-09 13:34:14 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-09 13:34:14 +0000 |
| commit | d1bcf106699939e75a44c899e780173b4c3292df (patch) | |
| tree | 1162c2aea613e1acc1cf444dabaaaa339c00f376 | |
| parent | This commit was manufactured by cvs2svn to create branch 'rtems-4-6-branch'. (diff) | |
| download | rtems-d1bcf106699939e75a44c899e780173b4c3292df.tar.bz2 | |
2004-02-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/rtems-source.add: New.
* Makefile.am: Add rtems/rtems-source.spec handling.
* configure.ac: AC_SUBST(RTEMS_VERSION,[_RTEMS_VERSION]).
* common/common.add.in: Use www.rtems.com as Vendor.
| -rw-r--r-- | scripts/ChangeLog | 7 | ||||
| -rw-r--r-- | scripts/Makefile.am | 8 | ||||
| -rw-r--r-- | scripts/common/common.add.in | 2 | ||||
| -rw-r--r-- | scripts/configure.ac | 21 |
4 files changed, 18 insertions, 20 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 59680b9e7d..8cbe71e4a6 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,10 @@ +2004-02-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * rtems/rtems-source.add: New. + * Makefile.am: Add rtems/rtems-source.spec handling. + * configure.ac: AC_SUBST(RTEMS_VERSION,[_RTEMS_VERSION]). + * common/common.add.in: Use www.rtems.com as Vendor. + 2004-01-23 Joel Sherrill <joel@OARcorp.com> * setup.def: Reflect new binutils RPM revision to correct defattr. diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 751f50a970..85744fce12 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -18,6 +18,14 @@ CONFIG_STATUS_DEPENDENCIES = setup.cache setup.cache: setup.def cp setup.def $@ +noinst_DATA += rtems/rtems-source.spec +rtems/rtems-source.spec: common/common.add \ + rtems/rtems-source.add \ + common/clean.add + cat $^ | sed 's,[@]rtems_version[@],$(RTEMS_VERSION),g' > $@ + +CLEANFILES = rtems/rtems-source.spec + DISTCLEANFILES = setup.cache include $(top_srcdir)/../automake/subdirs.am include $(top_srcdir)/../automake/local.am diff --git a/scripts/common/common.add.in b/scripts/common/common.add.in index 9365c88138..5995d6a9d2 100644 --- a/scripts/common/common.add.in +++ b/scripts/common/common.add.in @@ -23,7 +23,7 @@ # Work around to a bug in rpm-4.2 %define __os_install_post %{nil} -Vendor: OARCorp +Vendor: www.rtems.com Distribution: Linux BuildRoot: %{_defaultbuildroot} diff --git a/scripts/configure.ac b/scripts/configure.ac index 03d60f6f72..c6f9aeb69d 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_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) |