diff --git a/CONTRIBUTORS b/CONTRIBUTORS index bbfab372..c97158c3 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3369,6 +3369,7 @@ Stefan Hofmann "Play/Pause" key instead of separate keys for "Play" and "Pause" for a fix for compilers that don't like non-constant format strings for suggesting to implement jumping between errors while replaying a recording + for adding vdrrootdir and incdir to vdr.pc Stefan Blochberger for suggesting to automatically display the progress display whenever replay of a diff --git a/HISTORY b/HISTORY index 1cb324c4..ca23735a 100644 --- a/HISTORY +++ b/HISTORY @@ -10032,3 +10032,4 @@ Video Disk Recorder Revision History same VPS time (suggested by Markus Ehrnsperger). - The Channel+/- keys can now be used to jump between errors while replaying a recording (suggested by Stefan Hofmann). +- Added vdrrootdir and incdir to vdr.pc (thanks to Stefan Hofmann). diff --git a/Make.config.template b/Make.config.template index af4aedf6..8e510921 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 5.1 2022/11/26 13:37:06 kls Exp $ +# $Id: Make.config.template 5.2 2024/10/11 14:21:04 kls Exp $ ### The C compiler and options: @@ -33,14 +33,15 @@ endif # Default directories (adjust as necessary or desired): #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 -#DVBDIR = /usr/src/v4l-dvb/linux/include/uapi +#VDRROOT = $(PREFIX) +#BINDIR = $(VDRROOT)/bin +#INCDIR = $(VDRROOT)/include +#LIBDIR = $(VDRROOT)/lib +#LOCDIR = $(VDRROOT)/locale +#MANDIR = $(VDRROOT)/man +#PCDIR = $(VDRROOT)/pkgconfig +#RESDIR = $(VDRROOT)/share +#DVBDIR = /usr/include #VIDEODIR = /srv/vdr/video #CONFDIR = /var/lib/vdr diff --git a/Makefile b/Makefile index 195e08b3..696829c6 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 5.2 2024/01/05 14:16:16 kls Exp $ +# $Id: Makefile 5.3 2024/10/11 14:21:04 kls Exp $ .DELETE_ON_ERROR: @@ -46,13 +46,14 @@ ARGSDIR ?= /etc/vdr/conf.d 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 +VDRROOT ?= $(PREFIX) +BINDIR ?= $(VDRROOT)/bin +INCDIR ?= $(VDRROOT)/include +LIBDIR ?= $(VDRROOT)/lib/vdr +LOCDIR ?= $(VDRROOT)/share/locale +MANDIR ?= $(VDRROOT)/share/man +PCDIR ?= $(VDRROOT)/lib/pkgconfig +RESDIR ?= $(VDRROOT)/share/vdr # Source documentation @@ -169,7 +170,9 @@ make-libsi: # empty rule makes sure the sub-make for libsi is always called .PHONY: vdr.pc vdr.pc: - @echo "bindir=$(BINDIR)" > $@ + @echo "vdrrootdir=$(VDRROOT)" > $@ + @echo "bindir=$(BINDIR)" >> $@ + @echo "incdir=$(INCDIR)" >> $@ @echo "mandir=$(MANDIR)" >> $@ @echo "videodir=$(VIDEODIR)" >> $@ @echo "configdir=$(CONFDIR)" >> $@ @@ -320,6 +323,7 @@ install-doc: install-plugins: plugins @-for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\ + echo; echo "*** Plugin $$i:";\ $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) DESTDIR=$(DESTDIR) install;\ done @if [ -d $(PLUGINDIR)/lib ] ; then\ @@ -356,7 +360,7 @@ srcdoc: clean: @$(MAKE) --no-print-directory -C $(LSIDIR) clean @-rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~ - @-rm -rf $(LOCALEDIR) $(PODIR)/*.mo $(PODIR)/*.pot + @-rm -rf $(LOCALEDIR) $(PODIR)/*~ $(PODIR)/*.mo $(PODIR)/*.pot @-rm -rf include @-rm -rf srcdoc CLEAN: clean