diff options
| -rw-r--r-- | CONTRIBUTORS | 3 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | Make.config.template | 5 | ||||
| -rw-r--r-- | Makefile | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 14c65860..8cfa2cf9 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2065,6 +2065,9 @@ Anssi Hannula <anssi.hannula@gmail.com> that actually have a locale for suggesting to use setenv() instead of setlocale() to set the language for gettext() for fixing handling locale directories with a large number of entries + for suggesting to change the default for LOCDIR in Makefile and Make.config.template + to "./locale", so that internationalization works by default when running VDR + from within its source directory Antti Hartikainen <ami+vdr@ah.fi> for updating 'S13E' in 'sources.conf' @@ -5393,3 +5393,6 @@ Video Disk Recorder Revision History - Fixed some compiler warnings with gcc-4.2.0 (thanks to Matthias Schwarzott). - Fixed setting the locale file name in i18n-to-gettext.pl (thanks to Matthias Schwarzott). +- Changed the default for LOCDIR in Makefile and Make.config.template to + "./locale", so that internationalization works by default when running VDR + from within its source directory (suggested by Anssi Hannula). diff --git a/Make.config.template b/Make.config.template index 0c80d8ca..602a1e1b 100644 --- a/Make.config.template +++ b/Make.config.template @@ -6,7 +6,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Make.config.template 1.13 2007/08/12 20:43:46 kls Exp $ +# $Id: Make.config.template 1.14 2007/08/24 13:23:04 kls Exp $ ### The C compiler and options: @@ -26,9 +26,8 @@ endif #DVBDIR = /usr/src/v4l-dvb/linux MANDIR = /usr/local/man BINDIR = /usr/local/bin -# set to ./locale to run VDR from within its source directory: -LOCDIR = /usr/share/vdr/locale +LOCDIR = ./locale PLUGINDIR= ./PLUGINS PLUGINLIBDIR= $(PLUGINDIR)/lib VIDEODIR = /video @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 1.104 2007/08/15 13:47:16 kls Exp $ +# $Id: Makefile 1.105 2007/08/24 13:22:25 kls Exp $ .DELETE_ON_ERROR: @@ -19,7 +19,7 @@ DESTDIR ?= PREFIX ?= /usr/local MANDIR = $(PREFIX)/share/man BINDIR = $(PREFIX)/bin -LOCDIR = $(PREFIX)/share/vdr/locale +LOCDIR = ./locale LIBS = -ljpeg -lpthread -ldl -lcap -lfreetype -lfontconfig INCLUDES = -I/usr/include/freetype2 |