diff options
author | waker <wakeroid@gmail.com> | 2009-08-31 20:01:55 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2009-08-31 20:01:55 +0200 |
commit | 08e1a932dd88cb9195a1ce70d4b62e5d513460f3 (patch) | |
tree | 4e1315110f96042e441a3b5bcdb034bbbcb4754f /Makefile.am | |
parent | 6aabd78cc8ac501d3b43e4cfb6893612f5012cf5 (diff) | |
parent | 58a92f3cfe79597cc345ba6bd41668c9a44afdde (diff) |
Merge branch 'master' into plugins
Conflicts:
.gitignore
configure.in
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index a268aa7e..187e0c33 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,7 +40,10 @@ docsdir = $(datadir)/doc/$(PACKAGE) docs_DATA = README COPYING config-example -EXTRA_DIST = $(docs_DATA) +desktopdir = $(datadir)/applications +desktop_DATA = deadbeef.desktop.in + +EXTRA_DIST = $(docs_DATA) $(desktop_DATA) #install-data-local: # @$(NORMAL_INSTALL) |