Modified the Makefiles, by default VDR is now built according to the FHS

1 files changed, 31 insertions, 23 deletions

diff --git a/Make.config.template b/Make.config.template
index 4bf8db57..34a049b5 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 2.14 2012/12/28 09:55:22 kls Exp $
+# $Id: Make.config.template 2.15 2013/01/06 18:48:29 kls Exp $
 
 ### The C compiler and options:
 
@@ -14,48 +14,56 @@ CC       = gcc
 CFLAGS   = -g -O3 -Wall
 
 CXX      = g++
-CXXFLAGS = $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
-
-CFLAGS   += -fPIC
+CXXFLAGS = -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
 
 # Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine:
 ifdef M32
 CFLAGS   += -m32
+CXXFLAGS += -m32
 endif
 
 ### The directory environment:
 
-PREFIX   = /usr/local
-#DVBDIR   = /usr/src/v4l-dvb/linux
-MANDIR   = $(PREFIX)/man
-BINDIR   = $(PREFIX)/bin
-
 # Use this if you want to have a central place where you configure compile time
 # parameters for plugins:
 #PLGCFG = /etc/vdr/plugins.conf
 
-# By default locale and plugin files are built under the source directory:
-INCDIR       = $(CWD)/include
+# Use 'make LCLBLD=1' to build locale and plugin files under the source directory:
+ifdef LCLBLD
 LOCDIR       = $(CWD)/locale
 PLUGINDIR    = $(CWD)/PLUGINS
+ifndef PLUGIN # don't overwrite for plugins with old makefiles
 LIBDIR       = $(PLUGINDIR)/lib
-# By default VDR requires only one single directory to operate:
+endif
+HDRDIR       = $(CWD)/include
+endif
+
+# Use 'make ONEDIR=1' to have all data in one single directory:
+ifdef ONEDIR
 VIDEODIR     = /video
-# Activate the following line to build VDR according to the FHS ("File system Hierarchy Standard"):
-#USEFHS = 1
-ifdef USEFHS
-VIDEODIR     = /srv/vdr/video
-CONFDIR      = /var/lib/vdr
-CACHEDIR     = /var/cache/vdr
-RESDIR       = $(PREFIX)/share/vdr
-INCDIR       = $(PREFIX)/include
-LOCDIR       = $(PREFIX)/share/locale
-LIBDIR       = $(PREFIX)/lib/vdr
+CACHEDIR     = $(VIDEODIR)
+CONFDIR      = $(VIDEODIR)
+RESDIR       = $(VIDEODIR)
 endif
 
+# Other directories:
+
+#PREFIX   = /usr/local
+#BINDIR   = $(PREFIX)/bin
+#DVBDIR   = /usr/src/v4l-dvb/linux
+#MANDIR   = $(PREFIX)/man
+#INCDIR   = $(PREFIX)/include
+#PCDIR    = $(PREFIX)/lib/pkgconfig
+
 ### The remote control:
 
 LIRC_DEVICE = /var/run/lirc/lircd
 
-## Define if you want vdr to not run as root
+### Define if you want vdr to not run as root:
 #VDR_USER = vdr
+
+### Fallback for plugins with old makefiles:
+ifdef PLUGIN
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+endif