diff options
| author | Chris Johns <chrisj@rtems.org> | 2006-08-18 11:28:17 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2006-08-18 11:28:17 +0000 |
| commit | 8a1c14be105ae861ee94849acca4e6f88530a95e (patch) | |
| tree | 5b4b5770420430027540c10d16531e74054e155f /contrib | |
| parent | Updated the specs file. (diff) | |
| download | rtems-8a1c14be105ae861ee94849acca4e6f88530a95e.tar.bz2 | |
Renamed the spec file.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/rtemsrpms/Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/rtemsrpms/configure.ac | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/contrib/rtemsrpms/Makefile.am b/contrib/rtemsrpms/Makefile.am index 2f2ebfe4b7..482d3867f0 100644 --- a/contrib/rtemsrpms/Makefile.am +++ b/contrib/rtemsrpms/Makefile.am @@ -10,7 +10,7 @@ all: export PATH=$(prefix)/bin:$$PATH; \ for t in $(TARGETS) ; \ do \ - rpmbuild -v $(RPMDBPATH) -ba $(srcdir)/rtems.specs --target=$$t-rtems$(RTEMS_API) ; \ + rpmbuild -v $(RPMDBPATH) -ba $(srcdir)/rtems.spec --target=$$t-rtems$(RTEMS_API) ; \ if [ $$? -ne 0 ]; then \ exit 1 ; \ fi \ diff --git a/contrib/rtemsrpms/configure.ac b/contrib/rtemsrpms/configure.ac index 828fd6c3c8..42ff6aaec3 100644 --- a/contrib/rtemsrpms/configure.ac +++ b/contrib/rtemsrpms/configure.ac @@ -29,7 +29,6 @@ case "$prefix" in ;; NONE|$ac_default_prefix) prefix=$ac_default_prefix - rpmprefix="rtems-" ;; *) rpmprefix="custom-" @@ -57,10 +56,9 @@ AC_ARG_ENABLE([rpmdbpath], no) # use default ;; *) # presume user knows what he is doing - rpmdbpath=$enable_rpmdbpath;; + rpmdbpath="--dbpath $enable_rpmdbpath";; esac ]) -rpmdbpath="--dbpath $rpmdbpath" bootstrap=no AC_ARG_ENABLE([bootstrap], @@ -80,10 +78,10 @@ AC_ARG_ENABLE([bsps], yes) # ignore, use default ;; no) - bsps="RTEMS_BSPS=\"\"" + bsps="RTEMS_BSP=\"\"" ;; *) # take a the list to build - bsps="RTEMS_BSPS=\"$enable_bsps\"" + bsps="RTEMS_BSP=\"$enable_bsps\"" ;; esac ]) @@ -95,8 +93,8 @@ AC_SUBST(TARGETS, [$targets]) AC_SUBST(RPMPREFIX, [$rpmprefix]) AC_SUBST(RPMDBPATH, [$rpmdbpath]) AC_SUBST(RTEMS_BOOTSTRAP, [$bootstrap]) -AC_SUBST(RTEMS_BSPS, [$bsps]) +AC_SUBST(RTEMS_BSP, [$bsps]) -AC_CONFIG_FILES([Makefile rtems.specs]) +AC_CONFIG_FILES([Makefile rtems.spec]) AC_OUTPUT |