diff options
| -rw-r--r-- | scripts/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/Makefile.am | 40 |
2 files changed, 3 insertions, 46 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 2c7ba3a8e..d4b141633 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -36,24 +36,21 @@ rpmconfig_SCRIPTS = \ rpmconfig_SCRIPTS += macros.perl macros.perl: $(srcdir)/macros.perl.in - @sed \ - -e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \ + @cat \ < $(srcdir)/macros.perl.in > macros.perl CLEANFILES += macros.perl EXTRA_DIST += macros.perl.in rpmconfig_SCRIPTS += macros.php macros.php: $(srcdir)/macros.php.in - @sed \ - -e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \ + @cat \ < $(srcdir)/macros.php.in > macros.php CLEANFILES += macros.php EXTRA_DIST += macros.php.in rpmconfig_SCRIPTS += macros.python macros.python: $(srcdir)/macros.python.in - @sed \ - -e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \ + @cat \ < $(srcdir)/macros.python.in > macros.python CLEANFILES += macros.python EXTRA_DIST += macros.python.in diff --git a/tests/Makefile.am b/tests/Makefile.am index 212f7352d..6adf6dfb5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -70,54 +70,14 @@ atlocal: atlocal.in Makefile DISTCLEANFILES = atlocal EXTRA_DIST += atlocal.in -## Create a customized rpmrc -rpmrc: $(top_srcdir)/rpmrc.in - @sed \ - -e "s,[@]RPMCONFIGDIR[@],`pwd`/testing$(rpmconfigdir),g" \ - -e "s,[@]SYSCONFIGDIR[@],`pwd`/testing$(sysconfdir)/rpm,g" \ - -e "s,:~/.rpmmacros,," \ - < $(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 Makefile - @sed \ - -e "s,[@]RPMCONFIGDIR[@],`pwd`/testing$(rpmconfigdir),g" \ - < $(top_srcdir)/macros.in > macros.in -CLEANFILES += macros.in - - -## Create a customized rpmpopt -rpmpopt.in: $(top_srcdir)/rpmpopt.in Makefile - @sed \ - -e "s,[@]RPMCONFIGDIR[@],`pwd`/testing$(rpmconfigdir),g" \ - < $(top_srcdir)/rpmpopt.in > rpmpopt.in -CLEANFILES += rpmpopt.in - - # Hack: Abusing testing$(bindir)/rpmbuild as stamp file testing$(bindir)/rpmbuild: ../rpmbuild rm -rf testing (cd ${top_builddir} && \ $(MAKE) DESTDIR=`pwd`/${subdir}/testing install) -testing$(rpmconfigdir)/rpmrc: rpmrc testing$(bindir)/rpmbuild - $(INSTALL_DATA) rpmrc testing$(rpmconfigdir)/rpmrc - -testing$(rpmconfigdir)/macros: macros.in testing$(bindir)/rpmbuild - (cd ${top_builddir} && \ - ./config.status --file=${subdir}/testing$(rpmconfigdir)/macros:${subdir}/macros.in) - -testing$(rpmconfigdir)/rpmpopt-@VERSION@: rpmpopt.in testing$(bindir)/rpmbuild - (cd ${top_builddir} && \ - ./config.status --file=${subdir}/testing$(rpmconfigdir)/rpmpopt-@VERSION@:${subdir}/rpmpopt.in) - check_DATA = atconfig atlocal $(TESTSUITE) check_DATA += testing$(bindir)/rpmbuild -check_DATA += testing$(rpmconfigdir)/rpmrc -check_DATA += testing$(rpmconfigdir)/macros -check_DATA += testing$(rpmconfigdir)/rpmpopt-@VERSION@ check-local: $(check_DATA) $(SHELL) '$(TESTSUITE)' $(TESTSUITEFLAGS) ||: |