From 01da3a5ebee728b46f5df88add8d98b51d4c358d Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <mroi@users.sourceforge.net>
Date: Fri, 20 Sep 2002 15:53:24 +0000
Subject: first attempt to solve skin problem

CVS patchset: 2723
CVS date: 2002/09/20 15:53:24
---
 m4/xine.m4                  |  2 +-
 misc/Makefile.am            |  1 +
 misc/xine-config.in         | 12 ++++++------
 src/xine-engine/Makefile.am |  4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/m4/xine.m4 b/m4/xine.m4
index 73cd06c9c..252f6bca5 100644
--- a/m4/xine.m4
+++ b/m4/xine.m4
@@ -70,7 +70,7 @@ AC_ARG_ENABLE(xinetest,
              sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
       xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \
              sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-      xine_skin_dir=`$XINE_CONFIG $xine_config_args --skindir`
+      xine_data_dir=`$XINE_CONFIG $xine_config_args --datadir`
       xine_logo_mrl=`$XINE_CONFIG $xine_config_args --logomrl`
       xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir`
       xine_desktop_dir=`$XINE_CONFIG $xine_config_args --desktopdir`
diff --git a/misc/Makefile.am b/misc/Makefile.am
index cb5b60a7e..3213f21df 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -10,6 +10,7 @@ EXTRA_DIST = autogen.sh \
 	xine-lib.spec \
 	xine_logo.mpv
 
+datadir = $(XINE_DATADIR)
 data_DATA = xine_logo.mpv
 
 bin_SCRIPTS = xine-config
diff --git a/misc/xine-config.in b/misc/xine-config.in
index 828db3383..78006f158 100644
--- a/misc/xine-config.in
+++ b/misc/xine-config.in
@@ -17,7 +17,7 @@ Options:
         [--libs]
 	[--cflags]
 	[--plugindir]
-	[--skindir]
+	[--datadir]
 	[--logomrl]
 	[--scriptdir]
 	[--desktopdir]
@@ -65,8 +65,8 @@ while test $# -gt 0; do
     --plugindir)
       echo_plugindir=yes
       ;;
-    --skindir)
-      echo_skindir=yes
+    --datadir)
+      echo_datadir=yes
       ;;
     --logomrl)
       echo_logomrl=yes
@@ -105,11 +105,11 @@ fi
 if test "$echo_plugindir" = "yes"; then
       echo "@XINE_PLUGINPATH@"
 fi      
-if test "$echo_skindir" = "yes"; then
-      echo "@XINE_SKINPATH@"
+if test "$echo_datadir" = "yes"; then
+      echo "@XINE_DATADIR@"
 fi      
 if test "$echo_logomrl" = "yes"; then
-      echo "file://@XINE_SKINPATH@/xine_logo.mpv"
+      echo "file://@XINE_DATADIR@/xine_logo.mpv"
 fi      
 if test "$echo_scriptdir" = "yes"; then
       echo "@XINE_SCRIPTPATH@"
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index be75dd05e..77b131abf 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -2,7 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 ##
 
-CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_SKINPATH@/xine_logo.mpv\"
+CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\"file://@XINE_DATADIR@/xine_logo.mpv\"
 
 
 lib_LTLIBRARIES = libxine.la
@@ -33,7 +33,7 @@ noinst_HEADERS = bswap.h nvtvd.h
 @INCLUDED_INTL_TRUE@	@cd $(top_builddir)/intl && $(MAKE) libintl.la
 
 debug:
-	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\\\"file://@XINE_SKINPATH@/xine_logo.mpv\\\""
+	@$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(THREAD_CFLAGS) $(X_CFLAGS) -DXINE_LOGO_FILE=\\\"file://@XINE_DATADIR@/xine_logo.mpv\\\""
 
 install-debug: debug
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-- 
cgit v1.2.3