mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Made LIBDIR and LOCDIR non-overwriteable in plugin Makefiles
This commit is contained in:
		@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 1.14 2012/12/22 11:49:42 kls Exp $
 | 
			
		||||
# $Id: Makefile 1.15 2012/12/23 10:01:12 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -16,8 +16,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 1.7 2012/12/22 11:49:47 kls Exp $
 | 
			
		||||
# $Id: Makefile 1.8 2012/12/23 10:01:40 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -16,8 +16,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 2.14 2012/12/22 11:51:16 kls Exp $
 | 
			
		||||
# $Id: Makefile 2.15 2012/12/23 10:03:51 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -16,9 +16,9 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 2.10 2012/12/22 11:51:34 kls Exp $
 | 
			
		||||
# $Id: Makefile 2.11 2012/12/23 10:04:05 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -16,8 +16,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 2.14 2012/12/22 11:51:44 kls Exp $
 | 
			
		||||
# $Id: Makefile 2.15 2012/12/23 10:04:13 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -16,9 +16,9 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 1.7 2012/12/22 11:51:49 kls Exp $
 | 
			
		||||
# $Id: Makefile 1.8 2012/12/23 10:04:15 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -16,8 +16,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 2.8 2012/12/22 11:51:55 kls Exp $
 | 
			
		||||
# $Id: Makefile 2.9 2012/12/23 10:04:16 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -17,8 +17,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN1).c | awk '{ pr
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 2.14 2012/12/22 11:52:01 kls Exp $
 | 
			
		||||
# $Id: Makefile 2.15 2012/12/23 10:04:18 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -16,9 +16,9 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 2.9 2012/12/22 11:52:08 kls Exp $
 | 
			
		||||
# $Id: Makefile 2.10 2012/12/23 10:04:43 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -16,8 +16,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
#
 | 
			
		||||
# Makefile for a Video Disk Recorder plugin
 | 
			
		||||
#
 | 
			
		||||
# $Id: Makefile 2.9 2012/12/22 11:52:12 kls Exp $
 | 
			
		||||
# $Id: Makefile 2.10 2012/12/23 10:04:47 kls Exp $
 | 
			
		||||
 | 
			
		||||
# The official name of this plugin.
 | 
			
		||||
# This name will be used in the '-P...' option of VDR to load the plugin.
 | 
			
		||||
@@ -16,8 +16,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -12,7 +12,7 @@
 | 
			
		||||
# See the main source file 'vdr.c' for copyright information and
 | 
			
		||||
# how to reach the author.
 | 
			
		||||
#
 | 
			
		||||
# $Id: newplugin 2.13 2012/12/22 11:54:34 kls Exp $
 | 
			
		||||
# $Id: newplugin 2.14 2012/12/23 10:05:22 kls Exp $
 | 
			
		||||
 | 
			
		||||
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
 | 
			
		||||
 | 
			
		||||
@@ -75,9 +75,9 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 | 
			
		||||
### The directory environment:
 | 
			
		||||
 | 
			
		||||
# 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)
 | 
			
		||||
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)
 | 
			
		||||
#
 | 
			
		||||
TMPDIR ?= /tmp
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user