# HG changeset patch # User Yoshiki Yazawa # Date 1227551564 -32400 # Node ID 20f868cd576bcd515b22e656fd83706582b27b94 # Parent d834d2df8d7c52ca2baa69a91c64e32a3c981967 changed data path to audlegacy. diff -r d834d2df8d7c -r 20f868cd576b configure.ac --- a/configure.ac Tue Nov 25 02:14:56 2008 +0900 +++ b/configure.ac Tue Nov 25 03:32:44 2008 +0900 @@ -284,7 +284,7 @@ ### --------------------------------------------------------------------------- dnl Define plugin directories dnl ========================= -plugindir="$libdir/audacious" +plugindir="$libdir/audlegacy" AC_SUBST([plugindir]) AC_SUBST([pluginsubs]) @@ -311,7 +311,7 @@ localedir="$datadir/locale" AC_SUBST([localedir]) -AUDACIOUS_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/audacious\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\"" +AUDACIOUS_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/audlegacy\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\"" AC_SUBST([AUDACIOUS_DEFINES]) @@ -357,16 +357,16 @@ echo " AltiVec: $enable_altivec" echo "" -if test "x$AUDACIOUS_PATH" != "xno" && test "x$prefix/bin/audacious" != "x$AUDACIOUS_PATH"; then +if test "x$AUDACIOUS_PATH" != "xno" && test "x$prefix/bin/audlegacy" != "x$AUDACIOUS_PATH"; then audlocation=`dirname $AUDACIOUS_PATH` echo "**" - echo "** NOTICE! Configure has discovered that you already have Audacious installed" - echo "** and it does not match with the given --prefix. You have Audacious installed" + echo "** NOTICE! Configure has discovered that you already have Audlegacy installed" + echo "** and it does not match with the given --prefix. You have Audlegacy installed" echo "** in ${audlocation} and you chose ${prefix}/bin." echo "**" - echo "** If you don't want two copies of Audacious installed, rerun configure with" - echo "** the --prefix option set to the location of the old Audacious, or uninstall" - echo "** the old Audacious." + echo "** If you don't want two copies of Audlegacy installed, rerun configure with" + echo "** the --prefix option set to the location of the old Audlegacy, or uninstall" + echo "** the old Audlegacy." echo "**" fi diff -r d834d2df8d7c -r 20f868cd576b src/audacious/main.c --- a/src/audacious/main.c Tue Nov 25 02:14:56 2008 +0900 +++ b/src/audacious/main.c Tue Nov 25 03:32:44 2008 +0900 @@ -143,14 +143,14 @@ : g_strdup(getenv("XDG_CACHE_HOME"))); aud_paths[BMP_PATH_USER_DIR] = - g_build_filename(xdg_config_home, "audacious", NULL); + g_build_filename(xdg_config_home, "audlegacy", NULL); aud_paths[BMP_PATH_USER_SKIN_DIR] = - g_build_filename(xdg_data_home, "audacious", "Skins", NULL); + g_build_filename(xdg_data_home, "audlegacy", "Skins", NULL); aud_paths[BMP_PATH_USER_PLUGIN_DIR] = - g_build_filename(xdg_data_home, "audacious", "Plugins", NULL); + g_build_filename(xdg_data_home, "audlegacy", "Plugins", NULL); aud_paths[BMP_PATH_SKIN_THUMB_DIR] = - g_build_filename(xdg_cache_home, "audacious", "thumbs", NULL); + g_build_filename(xdg_cache_home, "audlegacy", "thumbs", NULL); aud_paths[BMP_PATH_PLAYLISTS_DIR] = g_build_filename(aud_paths[BMP_PATH_USER_DIR], "playlists", NULL);