Code

configure: fix default lyrics plugin directory
authorMax Kellermann <max@duempel.org>
Thu, 25 Sep 2008 13:42:17 +0000 (15:42 +0200)
committerMax Kellermann <max@duempel.org>
Thu, 25 Sep 2008 13:42:17 +0000 (15:42 +0200)
When the user does not specify "--prefix", ${prefix} is "NONE".  This
breaks the default lyrics plugin directory, which was
"${prefix}/lib/ncmpc/lyrics".  Fall back to ${ac_default_prefix} if
${prefix} is NONE.

configure.ac

index 3fa9ca6b71b839145d3f566ec0aa5e66833dda49..681a80ac97bd9da4a253a3183495d17268c2ddb4 100644 (file)
@@ -260,7 +260,14 @@ AC_ARG_WITH([lyrics-plugin-dir],
         AC_HELP_STRING([[--with-lyrics-plugin-dir[=DIRECTORY]]],
                        [Directory where lyrics plugins are stored @<:@default=PREFIX/lib/ncmpc/lyrics@:>@]),
        [lyrics_plugin_dir=$withval],
-       [lyrics_plugin_dir="$prefix/lib/ncmpc/lyrics"])
+       [lyrics_plugin_dir=""])
+if test "x${lyrics_plugin_dir}" = "x"; then
+    if test "x${prefix}" = "xNONE"; then
+        lyrics_plugin_dir="${ac_default_prefix}/lib/ncmpc/lyrics"
+    else
+        lyrics_plugin_dir="${prefix}/lib/ncmpc/lyrics"
+    fi
+fi
 AC_DEFINE_UNQUOTED([LYRICS_PLUGIN_DIR], ["$lyrics_plugin_dir"],
                   [Directory to search for lyrics plugins])
 AC_SUBST(lyrics_plugin_dir)