diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | m4/xine.m4 | 1 | ||||
| -rw-r--r-- | misc/xine-config.in | 7 | ||||
| -rw-r--r-- | misc/xine-lib.spec.in | 3 |
4 files changed, 1 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 9ef4b965c..d80bd1b9a 100644 --- a/configure.ac +++ b/configure.ac @@ -1018,10 +1018,6 @@ dnl Where scripts will/should be installed. eval XINE_SCRIPTPATH="${datadir}/xine/scripts" AC_SUBST(XINE_SCRIPTPATH) -dnl Where desktops icons will/should be installed. -eval XINE_DESKTOPPATH="${datadir}/xine/desktop" -AC_SUBST(XINE_DESKTOPPATH) - dnl --------------------------------------------- dnl Some informations about xine-lib compilation diff --git a/m4/xine.m4 b/m4/xine.m4 index 5003f40ad..1aed72edb 100644 --- a/m4/xine.m4 +++ b/m4/xine.m4 @@ -73,7 +73,6 @@ AC_ARG_ENABLE(xinetest, sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` xine_data_dir=`$XINE_CONFIG $xine_config_args --datadir` xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir` - xine_desktop_dir=`$XINE_CONFIG $xine_config_args --desktopdir` xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir` xine_locale_dir=`$XINE_CONFIG $xine_config_args --localedir` dnl if test "x$enable_xinetest" = "xyes" ; then diff --git a/misc/xine-config.in b/misc/xine-config.in index 25a58d580..159e3d892 100644 --- a/misc/xine-config.in +++ b/misc/xine-config.in @@ -20,7 +20,6 @@ Options: [--plugindir] [--datadir] [--scriptdir] - [--desktopdir] [--localedir] EOF exit $1 @@ -74,9 +73,6 @@ while test $# -gt 0; do --scriptdir) echo_scriptdir=yes ;; - --desktopdir) - echo_desktopdir=yes - ;; --localedir) echo_localedir=yes ;; @@ -115,9 +111,6 @@ fi if test "$echo_scriptdir" = "yes"; then echo "@XINE_SCRIPTPATH@" fi -if test "$echo_desktopdir" = "yes"; then - echo "@XINE_DESKTOPPATH@" -fi if test "$echo_localedir" = "yes"; then echo "@XINE_LOCALEPATH@" fi diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in index f839c3258..4a24badad 100644 --- a/misc/xine-lib.spec.in +++ b/misc/xine-lib.spec.in @@ -193,8 +193,7 @@ rm -rf $RPM_BUILD_ROOT %doc README TODO AUTHORS COPYING ChangeLog %{_bindir}/xine-config %{_libdir}/libxine*.so.* -%{_libdir}/xine/plugins/* -%{_datadir}/xine/skins/* +%{_libdir}/xine/plugins/%{version}/* %{_datadir}/xine/fonts/* %{_mandir}/man1/* %{_datadir}/locale/* |