diff -Naur main.old/DOCS/en/skin.html main/DOCS/en/skin.html
--- main.old/DOCS/en/skin.html Thu Feb 27 13:01:19 2003
+++ main/DOCS/en/skin.html Mon Jun 9 10:36:53 2003
@@ -45,7 +45,7 @@
<p>The directories searched for skins are (in order):</p>
<pre>
- $(DATADIR)/Skin/
+ $(MP_DATADIR)/Skin/
$(PREFIX)/share/mplayer/Skin/
~/.mplayer/Skin/
</pre>
diff -Naur main.old/DOCS/fr/skin.html main/DOCS/fr/skin.html
--- main.old/DOCS/fr/skin.html Fri Feb 28 18:58:06 2003
+++ main/DOCS/fr/skin.html Mon Jun 9 10:35:56 2003
@@ -44,7 +44,7 @@
<p>MPlayer cherche des skins dans ces répertoires (dans cet ordre):</p>
<pre>
- $(DATADIR)/Skin/
+ $(MP_DATADIR)/Skin/
/usr/local/share/mplayer/Skin/
~/.mplayer/Skin/
</pre>
diff -Naur main.old/DOCS/hu/skin.html main/DOCS/hu/skin.html
--- main.old/DOCS/hu/skin.html Mon Jan 27 10:39:27 2003
+++ main/DOCS/hu/skin.html Mon Jun 9 10:36:09 2003
@@ -76,7 +76,7 @@
A skineket a következõ könyvtárakban (és a megadott sorrendben)
keresi a program:
<pre>
- $(DATADIR)/Skin/
+ $(MP_DATADIR)/Skin/
$(PREFIX)/share/mplayer/Skin/
~/.mplayer/Skin/
</pre>
diff -Naur main.old/DOCS/it/skin.html main/DOCS/it/skin.html
--- main.old/DOCS/it/skin.html Sun Apr 6 22:01:54 2003
+++ main/DOCS/it/skin.html Mon Jun 9 10:36:58 2003
@@ -47,7 +47,7 @@
<p>Le directory in cui si cerca per le skin sono (in ordine):
<pre>
- $(DATADIR)/Skin/
+ $(MP_DATADIR)/Skin/
$(PREFIX)/share/mplayer/Skin/
~/.mplayer/Skin/
</pre>
diff -Naur main.old/DOCS/pl/skin.html main/DOCS/pl/skin.html
--- main.old/DOCS/pl/skin.html Sat Mar 22 16:33:06 2003
+++ main/DOCS/pl/skin.html Mon Jun 9 10:37:00 2003
@@ -45,7 +45,7 @@
<p>Katalogi przeszukiwane przez MPlayera w poszukiwaniu skór to (w kolejno¶ci szukania):</p>
<pre>
- $(DATADIR)/Skin/
+ $(MP_DATADIR)/Skin/
$(PREFIX)/share/mplayer/Skin/
~/.mplayer/Skin/
</pre>
diff -Naur main.old/DOCS/xml/en/skin.xml main/DOCS/xml/en/skin.xml
--- main.old/DOCS/xml/en/skin.xml Fri May 16 13:30:51 2003
+++ main/DOCS/xml/en/skin.xml Mon Jun 9 10:37:33 2003
@@ -31,7 +31,7 @@
The directories searched for skins are (in order):
<orderedlist>
<listitem><para>
-<filename class="directory">$(DATADIR)/Skin/</filename>
+<filename class="directory">$(MP_DATADIR)/Skin/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
diff -Naur main.old/DOCS/xml/fr/skin.xml main/DOCS/xml/fr/skin.xml
--- main.old/DOCS/xml/fr/skin.xml Fri May 16 13:20:06 2003
+++ main/DOCS/xml/fr/skin.xml Mon Jun 9 10:37:42 2003
@@ -31,7 +31,7 @@
MPlayer cherche des skins dans ces répertoires (dans cet ordre):
<orderedlist>
<listitem><para>
-<filename class="directory">$(DATADIR)/Skin/</filename>
+<filename class="directory">$(MP_DATADIR)/Skin/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
diff -Naur main.old/DOCS/zh/skin.html main/DOCS/zh/skin.html
--- main.old/DOCS/zh/skin.html Mon Mar 17 09:05:22 2003
+++ main/DOCS/zh/skin.html Mon Jun 9 10:37:17 2003
@@ -40,7 +40,7 @@
<p>skinµÄËÑË÷Ŀ¼(°´Ë³Ðò)ÊÇ£º</p>
<pre>
- $(DATADIR)/Skin/
+ $(MP_DATADIR)/Skin/
$(PREFIX)/share/mplayer/Skin/
~/.mplayer/Skin/
</pre>
diff -Naur main.old/Gui/interface.c main/Gui/interface.c
--- main.old/Gui/interface.c Mon May 26 08:33:43 2003
+++ main/Gui/interface.c Mon Jun 9 10:29:03 2003
@@ -188,7 +188,7 @@
wsXInit( (void *)mDisplay );
// --- load skin
skinDirInHome=get_path("Skin");
- skinMPlayerDir=DATADIR "/Skin";
+ skinMPlayerDir=MP_DATADIR "/Skin";
printf("SKIN dir 1: '%s'\n",skinDirInHome);
printf("SKIN dir 2: '%s'\n",skinMPlayerDir);
if ( !skinName ) skinName=strdup( "default" );
@@ -405,7 +405,7 @@
vo_font=read_font_desc( font_name,font_factor,0 );
if ( !vo_font )
{
- gfree( (void **)&font_name ); font_name=gstrdup( DATADIR"/font/font.desc" );
+ gfree( (void **)&font_name ); font_name=gstrdup( MP_DATADIR"/font/font.desc" );
vo_font=read_font_desc( font_name,font_factor,0 );
}
}
diff -Naur main.old/Makefile main/Makefile
--- main.old/Makefile Sun Jun 1 13:39:49 2003
+++ main/Makefile Mon Jun 9 10:35:17 2003
@@ -271,16 +271,16 @@
fi ; \
done
endif
- @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
- @if test ! -f $(DATADIR)/font/font.desc ; then \
+ @if test ! -d $(MP_DATADIR) ; then mkdir -p $(MP_DATADIR) ; fi
+ @if test ! -d $(MP_DATADIR)/font ; then mkdir -p $(MP_DATADIR)/font ; fi
+ @if test ! -f $(MP_DATADIR)/font/font.desc ; then \
echo "*** Download font at http://www.mplayerhq.hu/homepage/dload.html" ; \
- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \
+ echo "*** for OSD/Subtitles support and extract to $(MP_DATADIR)/font/" ; \
fi
ifeq ($(GUI),yes)
- @if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi
+ @if test ! -d $(MP_DATADIR)/Skin ; then mkdir -p $(MP_DATADIR)/Skin ; fi
@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
- @echo "*** for GUI, and extract to $(DATADIR)/Skin/"
+ @echo "*** for GUI, and extract to $(MP_DATADIR)/Skin/"
endif
@if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi
@if test -f $(CONFDIR)/codecs.conf.old ; then mv -f $(CONFDIR)/codecs.conf.old $(CONFDIR)/codecs.conf.older ; fi
diff -Naur main.old/configure main/configure
--- main.old/configure Fri Jun 6 19:57:05 2003
+++ main/configure Mon Jun 9 10:36:41 2003
@@ -5227,7 +5227,7 @@
DESTDIR =
prefix = \$(DESTDIR)$_prefix
BINDIR = \$(DESTDIR)$_bindir
-DATADIR = \$(DESTDIR)$_datadir
+MP_DATADIR = \$(DESTDIR)$_datadir
MANDIR = \$(DESTDIR)$_mandir
CONFDIR = \$(DESTDIR)$_confdir
LIBDIR = \$(DESTDIR)$_libdir
@@ -5421,7 +5421,7 @@
$_def_stddef
/* Common data directory (for fonts, etc) */
-#define DATADIR "$_datadir"
+#define MP_DATADIR "$_datadir"
#define CONFDIR "$_confdir"
#define LIBDIR "$_libdir"
diff -Naur main.old/debian/rules main/debian/rules
--- main.old/debian/rules Fri Apr 25 13:57:17 2003
+++ main/debian/rules Mon Jun 9 10:32:18 2003
@@ -54,7 +54,7 @@
dh_installdirs
# commands to install the package into debian/<packagename>
- $(MAKE) prefix=$(prefix)/usr BINDIR=$(prefix)/usr/bin CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib DATADIR=$(prefix)/usr/share/mplayer MANDIR=$(prefix)/usr/share/man install
+ $(MAKE) prefix=$(prefix)/usr BINDIR=$(prefix)/usr/bin CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib MP_DATADIR=$(prefix)/usr/share/mplayer MANDIR=$(prefix)/usr/share/man install
dh_link usr/bin/mplayer usr/bin/gmplayer \
usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz
diff -Naur main.old/debian-build/rules main/debian-build/rules
--- main.old/debian-build/rules Sun Feb 9 11:26:11 2003
+++ main/debian-build/rules Mon Jun 9 10:36:38 2003
@@ -126,7 +126,7 @@
dh_installdirs
# commands to install the package into debian/<packagename>
- $(MAKE) prefix=$(prefix)/usr BINDIR=$(prefix)/usr/bin CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib DATADIR=$(prefix)/usr/share/mplayer MANDIR=$(prefix)/usr/share/man install
+ $(MAKE) prefix=$(prefix)/usr BINDIR=$(prefix)/usr/bin CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib MP_DATADIR=$(prefix)/usr/share/mplayer MANDIR=$(prefix)/usr/share/man install
dh_link usr/bin/mplayer usr/bin/gmplayer \
usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz
diff -Naur main.old/libavcodec/os_support.h main/libavcodec/os_support.h
--- main.old/libavcodec/os_support.h Tue Apr 15 22:29:37 2003
+++ main/libavcodec/os_support.h Mon Jun 9 10:29:36 2003
@@ -11,7 +11,6 @@
*/
#ifdef __MINGW32__
-# undef DATADIR /* clashes with /usr/include/w32api/objidl.h */
# include <windows.h>
# define usleep(t) Sleep((t) / 1000)
#endif
diff -Naur main.old/libmpdemux/cache2.c main/libmpdemux/cache2.c
--- main.old/libmpdemux/cache2.c Tue Jun 3 17:43:49 2003
+++ main/libmpdemux/cache2.c Mon Jun 9 10:36:36 2003
@@ -22,7 +22,6 @@
#include <sys/wait.h>
#include "../osdep/shmem.h"
#else
-#undef DATADIR
#include <windows.h>
static DWORD WINAPI ThreadProc(void* s);
#endif
diff -Naur main.old/libmpdvdkit2/ioctl.c main/libmpdvdkit2/ioctl.c
--- main.old/libmpdvdkit2/ioctl.c Fri Feb 7 23:22:38 2003
+++ main/libmpdvdkit2/ioctl.c Mon Jun 9 10:30:03 2003
@@ -39,7 +39,6 @@
#include <sys/types.h>
#if defined( WIN32 )
-# undef DATADIR /* clashes with /usr/include/w32api/objidl.h */
# include <windows.h>
# include <winioctl.h>
#elif defined ( SYS_OS2 )
diff -Naur main.old/libvo/font_load.c main/libvo/font_load.c
--- main.old/libvo/font_load.c Sun Dec 29 13:59:23 2002
+++ main/libvo/font_load.c Mon Jun 9 10:30:33 2003
@@ -70,7 +70,7 @@
desc->fpath = dn; // search in the same dir as fonts.desc
// desc->fpath=get_path("font/");
-// if (stat(desc->fpath, &fstate)!=0) desc->fpath=DATADIR"/font";
+// if (stat(desc->fpath, &fstate)!=0) desc->fpath=MP_DATADIR"/font";
@@ -157,7 +157,7 @@
} else
if(strcmp(section,"[files]")==0){
- char *default_dir=DATADIR"/font";
+ char *default_dir=MP_DATADIR"/font";
if(pdb==2 && strcmp(p[0],"alpha")==0){
char *cp;
if (!(cp=malloc(strlen(desc->fpath)+strlen(p[1])+2))) return NULL;
diff -Naur main.old/libvo/font_load_ft.c main/libvo/font_load_ft.c
--- main.old/libvo/font_load_ft.c Thu Jan 30 18:58:43 2003
+++ main/libvo/font_load_ft.c Mon Jun 9 10:30:47 2003
@@ -905,7 +905,7 @@
if (err) {
err = FT_New_Face(library, get_path("subfont.ttf"), 0, face);
if (err) {
- err = FT_New_Face(library, DATADIR"/subfont.ttf", 0, face);
+ err = FT_New_Face(library, MP_DATADIR"/subfont.ttf", 0, face);
if (err) {
mp_msg(MSGT_OSD, MSGL_ERR, "New_Face failed. Maybe the font path is wrong.\nPlease supply the text font file (~/.mplayer/subfont.ttf).\n" );
return -1;
diff -Naur main.old/mencoder.c main/mencoder.c
--- main.old/mencoder.c Fri May 23 15:01:02 2003
+++ main/mencoder.c Mon Jun 9 10:28:04 2003
@@ -443,7 +443,7 @@
// try default:
vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
if(!vo_font)
- vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
+ vo_font=read_font_desc(MP_DATADIR"/font/font.desc",font_factor,verbose>1);
}
#endif
#endif
diff -Naur main.old/mplayer.c main/mplayer.c
--- main.old/mplayer.c Mon Jun 2 18:19:21 2003
+++ main/mplayer.c Mon Jun 9 10:28:23 2003
@@ -1038,7 +1038,7 @@
// try default:
vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1);
if(!vo_font)
- vo_font=read_font_desc(DATADIR"/font/font.desc",font_factor,verbose>1);
+ vo_font=read_font_desc(MP_DATADIR"/font/font.desc",font_factor,verbose>1);
}
#ifdef HAVE_FREETYPE
if (!vo_font)
diff -Naur main.old/osdep/glob-win.c main/osdep/glob-win.c
--- main.old/osdep/glob-win.c Fri Apr 25 10:00:18 2003
+++ main/osdep/glob-win.c Mon Jun 9 10:31:14 2003
@@ -5,7 +5,6 @@
#ifndef HAVE_GLOB
#ifdef __MINGW32__
-#undef DATADIR
#include <windows.h>
#include "glob.h"