summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2010-01-11 12:32:20 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2010-01-11 12:32:20 +0000
commit1ea3eb89583625eedde678034052fb2713e4ec21 (patch)
tree4008ed0b23c2ada0de030f274e5e3b7f6a300183
parentBump version. (diff)
downloadrtems-1ea3eb89583625eedde678034052fb2713e4ec21.tar.bz2
Sync with CVS-HEAD.
-rw-r--r--contrib/repo-conf/Makefile.am10
1 files changed, 3 insertions, 7 deletions
diff --git a/contrib/repo-conf/Makefile.am b/contrib/repo-conf/Makefile.am
index 6fed23d971..2054170c8a 100644
--- a/contrib/repo-conf/Makefile.am
+++ b/contrib/repo-conf/Makefile.am
@@ -38,9 +38,7 @@ EXTRA_DIST += $(srcdir)/yum.repos.d/*repo.in
gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-69ce4a83-44cc2b30
@$(mkdir_p) gpg
- sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
- -e 's,[@]OS_VERS[@],@OS_VERS@,' \
- < $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30 \
+ cat $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30 \
> gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
CLEANFILES += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30
@@ -48,9 +46,7 @@ EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30
gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-eac29b6f-3fe1f458
@$(mkdir_p) gpg
- sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
- -e 's,[@]OS_VERS[@],@OS_VERS@,' \
- < $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458 \
+ cat $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458 \
> gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
CLEANFILES += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458
@@ -66,6 +62,6 @@ apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
noinst_HEADERS = rtems-@RTEMS_API@-repo-conf.spec
-rtems-@RTEMS_API@-repo-conf.spec: rtems-repo-conf.spec.in configure.ac
+rtems-@RTEMS_API@-repo-conf.spec: rtems-repo-conf.spec.in config.status
./config.status --file=rtems-@RTEMS_API@-repo-conf.spec:rtems-repo-conf.spec.in
EXTRA_DIST += rtems-repo-conf.spec.in