diff options
| author | Ralf Corsépius <corsepiu@fedoraproject.org> | 2007-08-28 13:21:05 +0200 |
|---|---|---|
| committer | Ralf Corsépius <corsepiu@fedoraproject.org> | 2007-08-28 13:21:05 +0200 |
| commit | 604116eff7da7f84f6e294b0dd6e80c3f8155736 (patch) | |
| tree | 439b182af622da6ff94f9174caf72f224458ddb0 | |
| parent | 5553568c626b5ddb78be1c39f7aa499b3cf1fd98 (diff) | |
| download | rpm-604116eff7da7f84f6e294b0dd6e80c3f8155736.tar.gz rpm-604116eff7da7f84f6e294b0dd6e80c3f8155736.tar.bz2 rpm-604116eff7da7f84f6e294b0dd6e80c3f8155736.zip | |
Rework rpmrc generation.
| -rw-r--r-- | tests/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 227f39fc4..f329468af 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -58,13 +58,14 @@ DISTCLEANFILES = atlocal EXTRA_DIST += atlocal.in ## Create a customized rpmrc -rpmrc.in: $(top_srcdir)/rpmrc.in +rpmrc: $(top_srcdir)/rpmrc.in @sed \ -e "s,[@]RPMCONFIGDIR[@],`pwd`/testing$(RPMCONFIGDIR),g" \ - -e "s,[@]SYSCONFIGDIR[@],`pwd`/testing$(SYSCONFIGDIR),g" \ + -e "s,[@]SYSCONFIGDIR[@],`pwd`/testing$(sysconfdir)/rpm,g" \ -e "s,:~/.rpmmacros,," \ - < $(top_srcdir)/rpmrc.in > rpmrc.in -CLEANFILES += rpmrc.in + < $(top_srcdir)/rpmrc.in > rpmrc.tmp \ + && ( cd $(top_builddir) && ./config.status --file=${subdir}/rpmrc:${subdir}/rpmrc.tmp ) +CLEANFILES += rpmrc rpmrc.tmp ## Create a customized macros macros.in: $(top_srcdir)/macros.in @@ -83,11 +84,10 @@ CLEANFILES += rpmpopt.in ## Create a test-installation directory "testing" -testing@RPMCONFIGDIR@/rpmrc: rpmrc.in macros.in rpmpopt.in $(top_builddir)/config.status +testing@RPMCONFIGDIR@/rpmrc: rpmrc macros.in rpmpopt.in $(top_builddir)/config.status (cd ${top_builddir} && \ $(MAKE) DESTDIR=`pwd`/${subdir}/testing install) - (cd ${top_builddir} && \ - ./config.status --file=${subdir}/testing$(RPMCONFIGDIR)/rpmrc:${subdir}/rpmrc.in) + $(INSTALL_DATA) rpmrc testing$(RPMCONFIGDIR)/rpmrc (cd ${top_builddir} && \ ./config.status --file=${subdir}/testing$(RPMCONFIGDIR)/macros:${subdir}/macros.in) (cd ${top_builddir} && \ |