diff options
| author | František Dvořák <valtri@civ.zcu.cz> | 2009-01-12 19:26:24 +0100 |
|---|---|---|
| committer | František Dvořák <valtri@civ.zcu.cz> | 2009-01-12 19:26:24 +0100 |
| commit | c7e8597557c22896ba67517e5da7c79dab37b196 (patch) | |
| tree | 6b59652a25d02e6a35a250e4cb3ca65f6f47d2b8 | |
| parent | 7e47a3180c08f2fcaa688ab33cae838d88d8ba0e (diff) | |
| download | xine-lib-c7e8597557c22896ba67517e5da7c79dab37b196.tar.gz xine-lib-c7e8597557c22896ba67517e5da7c79dab37b196.tar.bz2 | |
Simplify using xine directories in configure, remove unnedded stuff.
Fixed font installation for Windows platforms.
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | misc/fonts/Makefile.am | 2 |
2 files changed, 3 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index f23a97b0b..3954d9f7b 100644 --- a/configure.ac +++ b/configure.ac @@ -2445,30 +2445,18 @@ XINE_REL_PLUGINDIR="$XINE_REL_PLUGINROOT.$XINE_LT_AGE" XINE_REL_FONTDIR="`makeexpand "$XINE_FONTDIR" | sed -e "s,^${prefix}/,,"`" XINE_REL_LOCALEDIR="`makeexpand "$XINE_LOCALEDIR" | sed -e "s,^${prefix}/,,"`" XINE_PKGCONFIG_DIR="`makeexpand "$pkgconfigdir"`" +dnl platform specific runtime directories if test "x$SYS" = "xmingw32" -o "x$SYS" = "xcygwin"; then - dnl prefix in xine-config - XINE_CONFIG_PREFIX="\$(cd \$(dirname \$0)/..; pwd)" - dnl installation directories (in xine-config) - XINE_PLUGINROOTPATH="$XINE_CONFIG_PREFIX/$XINE_REL_PLUGINROOT" - XINE_PLUGINPATH="$XINE_PLUGINROOTPATH.$XINE_LT_AGE" - XINE_FONTPATH="$XINE_CONFIG_PREFIX/$XINE_REL_FONTDIR" - XINE_LOCALEPATH="$XINE_CONFIG_PREFIX/$XINE_REL_LOCALEDIR" - dnl runtime directories AC_DEFINE(XINE_PLUGINROOT,[xine_get_pluginroot()],[Define this to general plugins directory location]) AC_DEFINE(XINE_PLUGINDIR,[xine_get_plugindir()],[Define this to specific plugins directory location]) AC_DEFINE(XINE_FONTDIR,[xine_get_fontdir()],[Define this to osd fonts dir location]) AC_DEFINE(XINE_LOCALEDIR,[xine_get_localedir()],[Path where catalog files will be.]) else - dnl prefix in xine-config - XINE_CONFIG_PREFIX="`makeexpand "${prefix}"`" - dnl directories from xine-config and runtime directories XINE_PLUGINROOTPATH="`makeexpand "$XINE_PLUGINROOT"`" - XINE_PLUGINPATH="$XINE_PLUGINROOTPATH.$XINE_LT_AGE" XINE_FONTPATH="`makeexpand "$XINE_FONTDIR"`" XINE_LOCALEPATH="`makeexpand "$XINE_LOCALEDIR"`" - dnl defining runtime directories AC_DEFINE_UNQUOTED(XINE_PLUGINROOT,"$XINE_PLUGINROOTPATH",[Define this to general plugins directory location]) - AC_DEFINE_UNQUOTED(XINE_PLUGINDIR,"$XINE_PLUGINPATH",[Define this to specific plugins directory location]) + AC_DEFINE_UNQUOTED(XINE_PLUGINDIR,"$XINE_PLUGINROOTPATH.$XINE_LT_AGE",[Define this to specific plugins directory location]) AC_DEFINE_UNQUOTED(XINE_FONTDIR,"$XINE_FONTPATH",[Define this to osd fonts dir location]) AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEPATH",[Path where catalog files will be.]) fi @@ -2476,10 +2464,6 @@ AC_DEFINE_UNQUOTED(XINE_REL_PLUGINDIR,"$XINE_REL_PLUGINDIR",[Define this to spec AC_DEFINE_UNQUOTED(XINE_REL_PLUGINROOT,"$XINE_REL_PLUGINROOT",[Define this to general plugin directory relative to execution prefix]) AC_DEFINE_UNQUOTED(XINE_REL_FONTDIR,"$XINE_REL_FONTDIR",[Define this to font directory relative to prefix]) AC_DEFINE_UNQUOTED(XINE_REL_LOCALEDIR,"$XINE_REL_LOCALEDIR",[Define this to font directory relative to prefix]) -AC_SUBST(XINE_CONFIG_PREFIX) -AC_SUBST(XINE_PLUGINPATH) -AC_SUBST(XINE_FONTPATH) -AC_SUBST(XINE_LOCALEPATH) AC_SUBST(XINE_PLUGINDIR) AC_SUBST(XINE_FONTDIR) AC_SUBST(XINE_LOCALEDIR) diff --git a/misc/fonts/Makefile.am b/misc/fonts/Makefile.am index ae22beefa..f5b131886 100644 --- a/misc/fonts/Makefile.am +++ b/misc/fonts/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -fontdir = $(XINE_FONTPATH) +fontdir = $(XINE_FONTDIR) font_DATA = \ cetus-16.xinefont.gz \ cetus-20.xinefont.gz \ |