diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-23 03:29:15 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-09-23 03:29:15 +0000 |
| commit | 6e81371002a968e52aaaa252e7fccdd6daf0df1a (patch) | |
| tree | 3a00020b2e6dd63aa64a76c02ecf397425c3283e /contrib | |
| parent | Sync with rtems-4.10. (diff) | |
| download | rtems-6e81371002a968e52aaaa252e7fccdd6daf0df1a.tar.bz2 | |
Sync with rtems-4.10.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/repo-conf/.cvsignore | 1 | ||||
| -rw-r--r-- | contrib/repo-conf/Makefile.am | 10 | ||||
| -rw-r--r-- | contrib/repo-conf/configure.ac | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/contrib/repo-conf/.cvsignore b/contrib/repo-conf/.cvsignore index ad9e720dcb..d55dba13d2 100644 --- a/contrib/repo-conf/.cvsignore +++ b/contrib/repo-conf/.cvsignore @@ -9,3 +9,4 @@ Makefile.in missing *.spec *.tar.bz2 +*.tar.xz 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 diff --git a/contrib/repo-conf/configure.ac b/contrib/repo-conf/configure.ac index 32c0cf1917..f61a33cb56 100644 --- a/contrib/repo-conf/configure.ac +++ b/contrib/repo-conf/configure.ac @@ -31,7 +31,7 @@ centos-5* | redhat-el5* | fedora-7* | fedora-8* | fedora-9* ) yum_verdir="5" apt_verdir="5" ;; -suse-* ) +suse-*) os_name="openSUSE" os_subdir="suse" os_vers=`echo $osname| sed -e 's,^.*-,,'` |