summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9ccdbcf)
raw | patch | inline | side by side (parent: 9ccdbcf)
author | Max Kellermann <max@duempel.org> | |
Thu, 25 Sep 2008 14:03:44 +0000 (16:03 +0200) | ||
committer | Max Kellermann <max@duempel.org> | |
Thu, 25 Sep 2008 14:03:44 +0000 (16:03 +0200) |
Don't install the lyrics plugins if the lyrics screen is disabled.
Makefile.am | patch | blob | history | |
configure.ac | patch | blob | history |
diff --git a/Makefile.am b/Makefile.am
index 8024b077539f5e48b0eafff2fb368b112c6019cb..e4f289585c7f032eab7f2984c1f59399e516e66a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
# lyrics plugins
#
+if LYRICS
+
lyrics_plugin_dir = @lyrics_plugin_dir@
lyrics_plugins = hd.py leoslyrics.py lyricswiki.rb
install-exec-local:
install -m 0755 -d $(DESTDIR)$(lyrics_plugin_dir)
install -m 0755 $(addprefix lyrics/,$(lyrics_plugins)) $(DESTDIR)$(lyrics_plugin_dir)
+
+endif
diff --git a/configure.ac b/configure.ac
index 681a80ac97bd9da4a253a3183495d17268c2ddb4..4084efd2a6d294279974d906ea72e972e0ccbd5d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
lyrics_screen=no
fi
+AM_CONDITIONAL(LYRICS, test x$lyrics_screen = xyes)
+
AC_MSG_RESULT([$lyrics_screen])
AC_ARG_WITH([lyrics-plugin-dir],