diff --git a/Make.config.template b/Make.config.template index 4bf8db5..6ba7639 100644 --- a/Make.config.template +++ b/Make.config.template @@ -14,44 +14,46 @@ 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 + +ifdef LCLBLD LOCDIR = $(CWD)/locale PLUGINDIR = $(CWD)/PLUGINS LIBDIR = $(PLUGINDIR)/lib + # By default VDR requires only one single directory to operate: + 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) + +#Make sure plugins find VDR's headers. +CINCLUDES = -I$(CWD)/include + endif +# Other possible 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: @@ -59,3 +61,10 @@ LIRC_DEVICE = /var/run/lirc/lircd ## 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 diff --git a/Makefile b/Makefile index f4d2341..2975408 100644 --- a/Makefile +++ b/Makefile @@ -16,43 +16,51 @@ CFLAGS ?= -g -O3 -Wall CXX ?= g++ CXXFLAGS ?= $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses -CFLAGS += -fPIC - CDEFINES = -D_GNU_SOURCE CDEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +LIBS = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig) +INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig) + # Directories: -CWD = . -LSIDIR = ./libsi -DESTDIR ?= -PREFIX ?= /usr/local -MANDIR ?= $(PREFIX)/share/man -BINDIR ?= $(PREFIX)/bin -INCDIR ?= $(CWD)/include -LOCDIR ?= $(CWD)/locale -LIBS = -ljpeg -lpthread -ldl -lcap -lrt $(shell pkg-config --libs freetype2 fontconfig) -INCLUDES ?= $(shell pkg-config --cflags freetype2 fontconfig) +CWD ?= $(shell pwd) +LSIDIR ?= $(CWD)/libsi +PLUGINDIR ?= $(CWD)/PLUGINS + +DESTDIR ?= +VIDEODIR ?= /srv/vdr/video +CONFDIR ?= /var/lib/vdr +CACHEDIR ?= /var/cache/vdr + + +PREFIX ?= /usr/local +BINDIR ?= $(PREFIX)/bin +INCDIR ?= $(PREFIX)/include +LIBDIR ?= $(PREFIX)/lib/vdr +LOCDIR ?= $(PREFIX)/share/locale +MANDIR ?= $(PREFIX)/share/man +PCDIR ?= $(PREFIX)/lib/pkgconfig +RESDIR ?= $(PREFIX)/share/vdr -PLUGINDIR= $(CWD)/PLUGINS -LIBDIR = $(PLUGINDIR)/lib +# Source documentation -# By default VDR requires only one single directory to operate: -VIDEODIR = /video -# See Make.config.template if you want to build VDR according to the FHS ("File system Hierarchy Standard") +DOXYGEN ?= /usr/bin/doxygen +DOXYFILE = Doxyfile -DOXYGEN ?= /usr/bin/doxygen -DOXYFILE = Doxyfile -PCDIR ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --variable=pc_path pkg-config):$(PREFIX)/lib/pkgconfig)) +# User configuration -include Make.config +CFLAGS += -fPIC +CXXFLAGS += -fPIC + ifdef DVBDIR -CFLAGS += -I$(DVBDIR) +CINCLUDES += -I$(DVBDIR) endif -UP3 = $(if $(findstring "$(LIBDIR)-$(LOCDIR)","$(CWD)/PLUGINS/lib-$(CWD)/locale"),../../../,) +# Object files SILIB = $(LSIDIR)/libsi.a @@ -63,7 +71,8 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d skinclassic.o skinlcars.o skins.o skinsttng.o sourceparams.o sources.o spu.o status.o svdrp.o themes.o thread.o\ timers.o tools.o transfer.o vdr.o videodir.o -DEFINES += $(CDEFINES) +DEFINES += $(CDEFINES) +INCLUDES += $(CINCLUDES) ifndef NO_KBD DEFINES += -DREMOTE_KBD @@ -90,12 +99,6 @@ DEFINES += -DRESDIR=\"$(RESDIR)\" DEFINES += -DPLUGINDIR=\"$(LIBDIR)\" DEFINES += -DLOCDIR=\"$(LOCDIR)\" -# Default values for directories: - -CONFDIRDEF = $(firstword $(CONFDIR) $(VIDEODIR)) -CACHEDIRDEF = $(firstword $(CACHEDIR) $(VIDEODIR)) -RESDIRDEF = $(firstword $(RESDIR) $(CONFDIRDEF)) - # The version numbers of VDR and the plugin API (taken from VDR's "config.h"): VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) @@ -110,7 +113,7 @@ all: vdr i18n plugins # Dependencies: -MAKEDEP = $(CXX) -MM -MG +MAKEDEP = $(CXX) -MM -MG $(CINCLUDES) DEPFILE = .dependencies $(DEPFILE): Makefile @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ @@ -133,16 +136,16 @@ $(SILIB): vdr.pc: @echo "bindir=$(BINDIR)" > $@ @echo "mandir=$(MANDIR)" >> $@ - @echo "configdir=$(CONFDIRDEF)" >> $@ + @echo "configdir=$(CONFDIR)" >> $@ @echo "videodir=$(VIDEODIR)" >> $@ - @echo "cachedir=$(CACHEDIRDEF)" >> $@ - @echo "resdir=$(RESDIRDEF)" >> $@ - @echo "libdir=$(UP3)$(LIBDIR)" >> $@ - @echo "locdir=$(UP3)$(LOCDIR)" >> $@ + @echo "cachedir=$(CACHEDIR)" >> $@ + @echo "resdir=$(RESDIR)" >> $@ + @echo "libdir=$(LIBDIR)" >> $@ + @echo "locdir=$(LOCDIR)" >> $@ @echo "plgcfg=$(PLGCFG)" >> $@ @echo "apiversion=$(APIVERSION)" >> $@ - @echo "cflags=$(CFLAGS) $(CDEFINES) -I$(UP3)$(INCDIR)" >> $@ - @echo "cxxflags=$(CXXFLAGS) $(CDEFINES) -I$(UP3)$(INCDIR)" >> $@ + @echo "cflags=$(CFLAGS) $(CDEFINES) $(CINCLUDES)" >> $@ + @echo "cxxflags=$(CXXFLAGS) $(CDEFINES) $(CINCLUDES)" >> $@ @echo "" >> $@ @echo "Name: VDR" >> $@ @echo "Description: Video Disk Recorder" >> $@ @@ -155,6 +158,7 @@ vdr.pc: PODIR = po LOCALEDIR = locale I18Npo = $(wildcard $(PODIR)/*.po) +I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) I18Npot = $(PODIR)/vdr.pot @@ -169,15 +173,14 @@ $(I18Npot): $(wildcard *.c) @touch $@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr.mo: $(PODIR)/%.mo - @mkdir -p $(dir $@) - cp $< $@ + install -D -m644 $< $@ .PHONY: i18n -i18n: $(I18Nmsgs) $(I18Npot) +i18n: $(I18Nmsgs) install-i18n: @mkdir -p $(DESTDIR)$(LOCDIR) - @(cd $(LOCALEDIR); cp -r --parents * $(DESTDIR)$(LOCDIR)) + cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR) # The 'include' directory (for plugins): @@ -192,36 +195,37 @@ include-dir: plugins: include-dir vdr.pc @failed="";\ noapiv="";\ + oldmakefile="";\ for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\ echo "*** Plugin $$i:";\ + # No APIVERSION: Skip \ if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\ echo "ERROR: plugin $$i doesn't honor APIVERSION - not compiled!";\ noapiv="$$noapiv $$i";\ continue;\ fi;\ - newmakefile=`grep "PKGCFG" "$(PLUGINDIR)/src/$$i/Makefile"`;\ - if [ -z "$$newmakefile" ]; then\ - echo "********************************************************************";\ - echo "* Your plugin \"$$i\" is using an old Makefile!";\ - echo "* While this currently still works, it is strongly recommended";\ - echo "* that you convert that Makefile to the new style used since";\ - echo "* VDR version 1.7.35. Support for old style Makefiles may be dropped";\ - echo "* in future versions of VDR.";\ - echo "********************************************************************";\ - $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" CXXFLAGS="$(CXXFLAGS)" VDRDIR=$(UP3) LIBDIR=../../lib all || failed="$$failed $$i";\ - else\ - target=all;\ - if [ "$(LIBDIR)" = "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" = "$(CWD)/locale" ]; then\ - target="install";\ - fi;\ - includes=;\ - if [ "$(INCDIR)" != "$(CWD)/include" ]; then\ - includes="INCLUDES=-I$(UP3)/include";\ + # Old Makefile \ + if ! grep -q "PKGCFG" "$(PLUGINDIR)/src/$$i/Makefile" ; then\ + echo "WARNING: plugin $$i is using an old Makefile!";\ + oldmakefile="$$oldmakefile $$i";\ + $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LIBDIR="$(PLUGINDIR)/lib" VDRDIR="$(CWD)" all || failed="$$failed $$i";\ + continue;\ + fi;\ + # New Makefile \ + INCLUDES="-I$(CWD)/include"\ + $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR="$(CWD)" || failed="$$failed $$i";\ + if [ "$(LIBDIR)" = "$(CWD)/PLUGINS/lib" ] && [ "$(LOCDIR)" = "$(CWD)/locale" ]; then\ + install "$(PLUGINDIR)/src/$$i/libvdr-$$i.so" $(LIBDIR)/libvdr-$$i.so.$(APIVERSION);\ + if [ -d $(PLUGINDIR)/src/$$i/po ]; then\ + for l in `ls $(PLUGINDIR)/src/$$i/po/*.mo`; do\ + install -D -m644 $$l $(LOCDIR)/`basename $$l | cut -d. -f1`/LC_MESSAGES/vdr-$$i.mo;\ + done;\ fi;\ - $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(UP3) $$includes $$target || failed="$$failed $$i";\ fi;\ done;\ + # Conclusion \ if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\ + if [ -n "$$oldmakefile" ] ; then echo; echo "*** plugins with old Makefile:$$oldmakefile"; echo; fi;\ if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; exit 1; fi clean-plugins: @@ -230,7 +234,7 @@ clean-plugins: # Install the files: -install: install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes install-pc +install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes # VDR binary: @@ -242,12 +246,12 @@ install-bin: vdr install-dirs: @mkdir -p $(DESTDIR)$(VIDEODIR) - @mkdir -p $(DESTDIR)$(CONFDIRDEF) - @mkdir -p $(DESTDIR)$(CACHEDIRDEF) - @mkdir -p $(DESTDIR)$(RESDIRDEF) + @mkdir -p $(DESTDIR)$(CONFDIR) + @mkdir -p $(DESTDIR)$(CACHEDIR) + @mkdir -p $(DESTDIR)$(RESDIR) install-conf: - @cp -n *.conf $(DESTDIR)$(CONFDIRDEF) + @cp -n *.conf $(DESTDIR)$(CONFDIR) # Documentation: @@ -262,8 +266,11 @@ install-doc: install-plugins: plugins @for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\ - $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(UP3) DESTDIR=$(DESTDIR) install;\ + $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) DESTDIR=$(DESTDIR) install;\ done + @if [ "`ls $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) 2> /dev/null`" ]; then\ + cp --force $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(LIBDIR);\ + fi # Includes: diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile index 67ff5e0..aa3cc0b 100644 --- a/PLUGINS/src/dvbhddevice/Makefile +++ b/PLUGINS/src/dvbhddevice/Makefile @@ -17,8 +17,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) -LOCDIR = $(DESTDIR)$(call PKGCFG,locdir) +LIBDIR = $(call PKGCFG,libdir) +LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(DEPFILE): Makefile PODIR = po I18Npo = $(wildcard $(PODIR)/*.po) I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) -I18Nmsgs = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) +I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) I18Npot = $(PODIR)/$(PLUGIN).pot %.mo: %.po @@ -91,7 +91,7 @@ $(I18Npot): $(wildcard *.c) msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $< @touch $@ -$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo +$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo install -D -m644 $< $@ .PHONY: i18n @@ -106,7 +106,7 @@ $(SOFILE): $(OBJS) libhdffcmd $(CXX) $(CXXFLAGS) -shared $(OBJS) libhdffcmd/libhdffcmd.a -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib install-i18n diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile index a18a57c..f74a97e 100644 --- a/PLUGINS/src/dvbsddevice/Makefile +++ b/PLUGINS/src/dvbsddevice/Makefile @@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LIBDIR = $(call PKGCFG,libdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile index 91aae7f..ebbe654 100644 --- a/PLUGINS/src/epgtableid0/Makefile +++ b/PLUGINS/src/epgtableid0/Makefile @@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LIBDIR = $(call PKGCFG,libdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile index b729122..9747078 100644 --- a/PLUGINS/src/hello/Makefile +++ b/PLUGINS/src/hello/Makefile @@ -17,8 +17,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) -LOCDIR = $(DESTDIR)$(call PKGCFG,locdir) +LIBDIR = $(call PKGCFG,libdir) +LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(DEPFILE): Makefile PODIR = po I18Npo = $(wildcard $(PODIR)/*.po) I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) -I18Nmsgs = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) +I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) I18Npot = $(PODIR)/$(PLUGIN).pot %.mo: %.po @@ -91,7 +91,7 @@ $(I18Npot): $(wildcard *.c) msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $< @touch $@ -$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo +$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo install -D -m644 $< $@ .PHONY: i18n @@ -105,7 +105,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib install-i18n diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile index 2d24485..67485d7 100644 --- a/PLUGINS/src/osddemo/Makefile +++ b/PLUGINS/src/osddemo/Makefile @@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LIBDIR = $(call PKGCFG,libdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile index 71377c9..6bcd136 100644 --- a/PLUGINS/src/pictures/Makefile +++ b/PLUGINS/src/pictures/Makefile @@ -17,8 +17,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) -LOCDIR = $(DESTDIR)$(call PKGCFG,locdir) +LIBDIR = $(call PKGCFG,libdir) +LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(DEPFILE): Makefile PODIR = po I18Npo = $(wildcard $(PODIR)/*.po) I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) -I18Nmsgs = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) +I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) I18Npot = $(PODIR)/$(PLUGIN).pot %.mo: %.po @@ -91,7 +91,7 @@ $(I18Npot): $(wildcard *.c) msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $< @touch $@ -$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo +$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo install -D -m644 $< $@ .PHONY: i18n @@ -105,7 +105,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib install-i18n diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile index db0818c..09cf744 100644 --- a/PLUGINS/src/rcu/Makefile +++ b/PLUGINS/src/rcu/Makefile @@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LIBDIR = $(call PKGCFG,libdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile index df4e372..9f61657 100644 --- a/PLUGINS/src/servicedemo/Makefile +++ b/PLUGINS/src/servicedemo/Makefile @@ -18,7 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LIBDIR = $(call PKGCFG,libdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,8 +78,8 @@ libvdr-$(PLUGIN2).so: $(PLUGIN2).o $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@ install-lib: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so - install -D libvdr-$(PLUGIN1).so $(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION) - install -D libvdr-$(PLUGIN2).so $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION) + install -D libvdr-$(PLUGIN1).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION) + install -D libvdr-$(PLUGIN2).so $(DESTDIR)$(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION) install: install-lib diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile index 6ba4d25..72f41d3 100644 --- a/PLUGINS/src/skincurses/Makefile +++ b/PLUGINS/src/skincurses/Makefile @@ -17,8 +17,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) -LOCDIR = $(DESTDIR)$(call PKGCFG,locdir) +LIBDIR = $(call PKGCFG,libdir) +LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(DEPFILE): Makefile PODIR = po I18Npo = $(wildcard $(PODIR)/*.po) I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) -I18Nmsgs = $(addprefix $(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) +I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) I18Npot = $(PODIR)/$(PLUGIN).pot %.mo: %.po @@ -91,7 +91,7 @@ $(I18Npot): $(wildcard *.c) msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $< @touch $@ -$(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo +$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo install -D -m644 $< $@ .PHONY: i18n @@ -105,7 +105,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -lncursesw -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib install-i18n diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile index 9635a5d..bb05e7e 100644 --- a/PLUGINS/src/status/Makefile +++ b/PLUGINS/src/status/Makefile @@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LIBDIR = $(call PKGCFG,libdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile index d40e483..59f521c 100644 --- a/PLUGINS/src/svdrpdemo/Makefile +++ b/PLUGINS/src/svdrpdemo/Makefile @@ -17,7 +17,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri # Use package data if installed...otherwise assume we're under the VDR source directory: PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) -LIBDIR = $(DESTDIR)$(call PKGCFG,libdir) +LIBDIR = $(call PKGCFG,libdir) PLGCFG = $(call PKGCFG,plgcfg) # TMPDIR ?= /tmp @@ -78,7 +78,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) - install -D $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib