Changeset 191ac9d for Makefile


Ignore:
Timestamp:
2011-11-28T08:42:10Z (13 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
bd31661
Parents:
ddcff199 (diff), e4fc493 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging typo fix for Skype config installation.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rddcff199 r191ac9d  
    123123        mkdir -p $(DESTDIR)$(ETCDIR)/../skyped
    124124        install -m 0644 $(SRCDIR)protocols/skype/skyped.cnf $(DESTDIR)$(ETCDIR)/../skyped/skyped.cnf
    125         install -m 0644 $(SRCDIR)protocols/skype/skyped.conf $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
     125        install -m 0644 $(SRCDIR)protocols/skype/skyped.conf.dist $(DESTDIR)$(ETCDIR)/../skyped/skyped.conf
    126126        install -m 0755 $(SRCDIR)protocols/skype/skyped.py $(DESTDIR)$(BINDIR)/skyped
    127127endif
Note: See TracChangeset for help on using the changeset viewer.