frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/vdr-projects/vdr.git synced 2025-03-01 10:50:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added vdrrootdir and incdir to vdr.pc

Browse Source
This commit is contained in:
Klaus Schmidinger 2024-10-11 14:21:04 +02:00
parent b4c538cff7
commit 55cfb057e0
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -3369,6 +3369,7 @@ Stefan Hofmann <stefan.hofmann@t-online.de>
"Play/Pause" key instead of separate keys for "Play" and "Pause" "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 a fix for compilers that don't like non-constant format strings
for suggesting to implement jumping between errors while replaying a recording for suggesting to implement jumping between errors while replaying a recording
for adding vdrrootdir and incdir to vdr.pc
Stefan Blochberger <Stefan.Blochberger@gmx.de> Stefan Blochberger <Stefan.Blochberger@gmx.de>
for suggesting to automatically display the progress display whenever replay of a for suggesting to automatically display the progress display whenever replay of a

1
HISTORY
View File

@ -10032,3 +10032,4 @@ Video Disk Recorder Revision History
same VPS time (suggested by Markus Ehrnsperger). same VPS time (suggested by Markus Ehrnsperger).
- The Channel+/- keys can now be used to jump between errors while replaying a recording - The Channel+/- keys can now be used to jump between errors while replaying a recording
(suggested by Stefan Hofmann). (suggested by Stefan Hofmann).
- Added vdrrootdir and incdir to vdr.pc (thanks to Stefan Hofmann).

19
Make.config.template
View File

@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # 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: ### The C compiler and options:
@ -33,14 +33,15 @@ endif
# Default directories (adjust as necessary or desired): # Default directories (adjust as necessary or desired):
#PREFIX = /usr/local #PREFIX = /usr/local
#BINDIR = $(PREFIX)/bin #VDRROOT = $(PREFIX)
#INCDIR = $(PREFIX)/include #BINDIR = $(VDRROOT)/bin
#LIBDIR = $(PREFIX)/lib/vdr #INCDIR = $(VDRROOT)/include
#LOCDIR = $(PREFIX)/share/locale #LIBDIR = $(VDRROOT)/lib
#MANDIR = $(PREFIX)/share/man #LOCDIR = $(VDRROOT)/locale
#PCDIR = $(PREFIX)/lib/pkgconfig #MANDIR = $(VDRROOT)/man
#RESDIR = $(PREFIX)/share/vdr #PCDIR = $(VDRROOT)/pkgconfig
#DVBDIR = /usr/src/v4l-dvb/linux/include/uapi #RESDIR = $(VDRROOT)/share
#DVBDIR = /usr/include
#VIDEODIR = /srv/vdr/video #VIDEODIR = /srv/vdr/video
#CONFDIR = /var/lib/vdr #CONFDIR = /var/lib/vdr

24
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # 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: .DELETE_ON_ERROR:
@ -46,13 +46,14 @@ ARGSDIR ?= /etc/vdr/conf.d
CACHEDIR ?= /var/cache/vdr CACHEDIR ?= /var/cache/vdr
PREFIX ?= /usr/local PREFIX ?= /usr/local
BINDIR ?= $(PREFIX)/bin VDRROOT ?= $(PREFIX)
INCDIR ?= $(PREFIX)/include BINDIR ?= $(VDRROOT)/bin
LIBDIR ?= $(PREFIX)/lib/vdr INCDIR ?= $(VDRROOT)/include
LOCDIR ?= $(PREFIX)/share/locale LIBDIR ?= $(VDRROOT)/lib/vdr
MANDIR ?= $(PREFIX)/share/man LOCDIR ?= $(VDRROOT)/share/locale
PCDIR ?= $(PREFIX)/lib/pkgconfig MANDIR ?= $(VDRROOT)/share/man
RESDIR ?= $(PREFIX)/share/vdr PCDIR ?= $(VDRROOT)/lib/pkgconfig
RESDIR ?= $(VDRROOT)/share/vdr
# Source documentation # Source documentation
@ -169,7 +170,9 @@ make-libsi: # empty rule makes sure the sub-make for libsi is always called
.PHONY: vdr.pc .PHONY: vdr.pc
vdr.pc: vdr.pc:
@echo "bindir=$(BINDIR)" > $@ @echo "vdrrootdir=$(VDRROOT)" > $@
@echo "bindir=$(BINDIR)" >> $@
@echo "incdir=$(INCDIR)" >> $@
@echo "mandir=$(MANDIR)" >> $@ @echo "mandir=$(MANDIR)" >> $@
@echo "videodir=$(VIDEODIR)" >> $@ @echo "videodir=$(VIDEODIR)" >> $@
@echo "configdir=$(CONFDIR)" >> $@ @echo "configdir=$(CONFDIR)" >> $@
@ -320,6 +323,7 @@ install-doc:
install-plugins: plugins install-plugins: plugins
@-for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\ @-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;\ $(MAKE) --no-print-directory -C "$(PLUGINDIR)/src/$$i" VDRDIR=$(CWD) DESTDIR=$(DESTDIR) install;\
done done
@if [ -d $(PLUGINDIR)/lib ] ; then\ @if [ -d $(PLUGINDIR)/lib ] ; then\
@ -356,7 +360,7 @@ srcdoc:
clean: clean:
@$(MAKE) --no-print-directory -C $(LSIDIR) clean @$(MAKE) --no-print-directory -C $(LSIDIR) clean
@-rm -f $(OBJS) $(DEPFILE) vdr vdr.pc core* *~ @-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 include
@-rm -rf srcdoc @-rm -rf srcdoc
CLEAN: clean CLEAN: clean