From 81ad3820d574d1fc79b38db96f5c7b9f9ebfc80f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 11 Jun 2009 00:22:58 +0200 Subject: [PATCH 1/1] Makefile.am: install lyrics plugins with automake Set $(lyrics_SCRIPTS) instead of manually installing those plugins. This is more consistent with automake, and automake gives us uninstall. --- Makefile.am | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index b1b50dc..26880ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -151,13 +151,12 @@ sparse-check: # lyrics plugins # -lyrics_plugins = 01-hd.sh 02-lyricwiki.rb 03-leoslyrics.py +lyrics_plugins = lyrics/01-hd.sh lyrics/02-lyricwiki.rb lyrics/03-leoslyrics.py if ENABLE_LYRICS_SCREEN -install-exec-local: - install -m 0755 -d $(DESTDIR)$(lyrics_plugin_dir) - cd lyrics && install -m 0755 $(lyrics_plugins) $(DESTDIR)$(lyrics_plugin_dir) +lyricsdir = $(lyrics_plugin_dir) +lyrics_SCRIPTS = $(lyrics_plugins) endif @@ -175,5 +174,5 @@ man_MANS = doc/ncmpc.1 # EXTRA_DIST = autogen.sh \ - $(addprefix lyrics/,$(lyrics_plugins)) \ + $(lyrics_plugins) \ $(man_MANS) $(doc_DATA) -- 2.30.2