diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-01-29 16:45:53 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-02-01 13:39:42 +0200 |
| commit | 5864f68c10f5b45ca7c8cb7e1493a5429aa95b78 (patch) | |
| tree | 1a9981fa9d86f3120e236be432d361d7970755e8 | |
| parent | 95b177fcfb7e8939d2d056d29216273d20c6aed4 (diff) | |
| download | rpm-5864f68c10f5b45ca7c8cb7e1493a5429aa95b78.tar.gz rpm-5864f68c10f5b45ca7c8cb7e1493a5429aa95b78.tar.bz2 rpm-5864f68c10f5b45ca7c8cb7e1493a5429aa95b78.zip | |
Eliminate unnecessary processing on scripts/macros.*
- these used to require processing for rpm config dir location
but not anymore since %{_rpmconfigdir} addition
| -rw-r--r-- | scripts/Makefile.am | 26 | ||||
| -rw-r--r-- | scripts/macros.perl (renamed from scripts/macros.perl.in) | 0 | ||||
| -rw-r--r-- | scripts/macros.php (renamed from scripts/macros.php.in) | 0 | ||||
| -rw-r--r-- | scripts/macros.python (renamed from scripts/macros.python.in) | 0 |
4 files changed, 4 insertions, 22 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 753c4a5c4..b2927d99c 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -20,7 +20,8 @@ EXTRA_DIST = \ mono-find-requires mono-find-provides \ ocaml-find-requires.sh ocaml-find-provides.sh \ pkgconfigdeps.sh libtooldeps.sh \ - fontconfig.prov desktop-file.prov + fontconfig.prov desktop-file.prov \ + macros.perl macros.php macros.python rpmconfig_SCRIPTS = \ brp-compress brp-python-bytecompile brp-java-gcjcompile \ @@ -37,25 +38,6 @@ rpmconfig_SCRIPTS = \ rpmdb_loadcvt rpmdiff rpm2cpio.sh tcl.req tgpg rpmconfig_DATA = \ - rpmdiff.cgi rpm.daily rpm.log rpm.xinetd - -rpmconfig_DATA += macros.perl -macros.perl: $(srcdir)/macros.perl.in - @cat \ - < $(srcdir)/macros.perl.in > macros.perl -CLEANFILES += macros.perl -EXTRA_DIST += macros.perl.in - -rpmconfig_DATA += macros.php -macros.php: $(srcdir)/macros.php.in - @cat \ - < $(srcdir)/macros.php.in > macros.php -CLEANFILES += macros.php -EXTRA_DIST += macros.php.in + rpmdiff.cgi rpm.daily rpm.log rpm.xinetd \ + macros.perl macros.php macros.python -rpmconfig_DATA += macros.python -macros.python: $(srcdir)/macros.python.in - @cat \ - < $(srcdir)/macros.python.in > macros.python -CLEANFILES += macros.python -EXTRA_DIST += macros.python.in diff --git a/scripts/macros.perl.in b/scripts/macros.perl index 037041170..037041170 100644 --- a/scripts/macros.perl.in +++ b/scripts/macros.perl diff --git a/scripts/macros.php.in b/scripts/macros.php index cf20728b0..cf20728b0 100644 --- a/scripts/macros.php.in +++ b/scripts/macros.php diff --git a/scripts/macros.python.in b/scripts/macros.python index ea1f200fc..ea1f200fc 100644 --- a/scripts/macros.python.in +++ b/scripts/macros.python |