Changeset e1be2b3 in rtems for contrib/repo-conf/Makefile.am


Ignore:
Timestamp:
Apr 30, 2009, 4:38:01 PM (12 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.8
Children:
d7196bf
Parents:
72c7d3e
Message:

Merge changes from CVS-HEAD addressing Fedora 11 rpm regressions.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/repo-conf/Makefile.am

    r72c7d3e re1be2b3  
    3030          -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
    3131          -e 's,[@]OS_NAME[@],@OS_NAME@,' \
     32          -e 's,[@]OS_VERS[@],@OS_VERS@,' \
    3233          -e 's,[@]YUM_VERDIR[@],@YUM_VERDIR@,' \
    3334          < $(srcdir)/yum.repos.d/rtems.repo.in \
     
    3637EXTRA_DIST += $(srcdir)/yum.repos.d/*repo.in
    3738
     39gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-69ce4a83-44cc2b30
     40        @$(mkdir_p) gpg
     41        sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
     42          -e 's,[@]OS_VERS[@],@OS_VERS@,' \
     43          < $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30 \
     44          > gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     45CLEANFILES += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     46EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30
     47
     48
     49gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-eac29b6f-3fe1f458
     50        @$(mkdir_p) gpg
     51        sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
     52          -e 's,[@]OS_VERS[@],@OS_VERS@,' \
     53          < $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458 \
     54          > gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
     55CLEANFILES += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
     56EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458
     57
    3858yum_gpgdir = $(sysconfdir)/pki/rpm-gpg
    3959yum_gpg_DATA =
    40 yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30
    41 yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458
     60yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     61yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
    4262
    4363apt_gpgdir = $(sysconfdir)/apt/gpg
    4464apt_gpg_DATA =
    45 apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30
    46 apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458
    47 
    48 EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey*
     65apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     66apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
    4967
    5068noinst_HEADERS = rtems-@RTEMS_API@-repo-conf.spec
Note: See TracChangeset for help on using the changeset viewer.