diff mbox

Makefile variable names LCLBLD and PLGCFG

Message ID 5145AD10.1060702@iki.fi
State New
Headers

Commit Message

Ville Skyttä March 17, 2013, 11:46 a.m. UTC 
  Hello,

Should probably have spoken earlier, but is there any particular reason
for the ugly and hard to read Makefile variable names LCLBLD and PLGCFG?
I suppose they're short for LOCALBUILD and PLUGINCONFIG, but why do they
have to be short for anything, it's not like we're running out of space
for their names anywhere, is it? Besides, I don't think LCLBLD describes
what its effects are very well, INPLACE would sounds better to me.

The ship may already have sailed for plgcfg in vdr.pc as it's being used
by many plugin Makefiles already, but I believe the attached patches
should be safe for 2.0.0.

Comments

Klaus Schmidinger March 17, 2013, noon UTC | #1 
On 17.03.2013 12:46, Ville Skyttä wrote:
> Hello,
>
> Should probably have spoken earlier, but is there any particular reason
> for the ugly and hard to read Makefile variable names LCLBLD and PLGCFG?
> I suppose they're short for LOCALBUILD and PLUGINCONFIG, but why do they
> have to be short for anything, it's not like we're running out of space
> for their names anywhere, is it? Besides, I don't think LCLBLD describes
> what its effects are very well, INPLACE would sounds better to me.
>
> The ship may already have sailed for plgcfg in vdr.pc as it's being used
> by many plugin Makefiles already, but I believe the attached patches
> should be safe for 2.0.0.

I'm afraid it's too late for that.

Sorry for the time you wasted - you should have asked first.

Klaus
Ville Skyttä March 17, 2013, 4:45 p.m. UTC | #2 
On 2013-03-17 14:00, Klaus Schmidinger wrote:

> I'm afraid it's too late for that.

HWLLBDCLLBTHVTRWY
Carsten Koch March 17, 2013, 5 p.m. UTC | #3 
On 03/17/13 13:00, Klaus Schmidinger wrote:
> On 17.03.2013 12:46, Ville Skyttä wrote:
>> Hello,
>>
>> Should probably have spoken earlier, but is there any particular reason
>> for the ugly and hard to read Makefile variable names LCLBLD and PLGCFG?
>> I suppose they're short for LOCALBUILD and PLUGINCONFIG, but why do they
>> have to be short for anything, it's not like we're running out of space
>> for their names anywhere, is it? Besides, I don't think LCLBLD describes
>> what its effects are very well, INPLACE would sounds better to me.
>>
>> The ship may already have sailed for plgcfg in vdr.pc as it's being used
>> by many plugin Makefiles already, but I believe the attached patches
>> should be safe for 2.0.0.
>
> I'm afraid it's too late for that.

I do not understand why it should be too late.
2.0 is not out yet.

But if they really cannot have readable names,
at least I would not provide a default, but  let
the makefile issue a message that they must
be set (as I suggested in the other thread).

Carsten.
Klaus Schmidinger March 17, 2013, 5:06 p.m. UTC | #4 
On 17.03.2013 18:00, Carsten Koch wrote:
> On 03/17/13 13:00, Klaus Schmidinger wrote:
>> On 17.03.2013 12:46, Ville Skyttä wrote:
>>> Hello,
>>>
>>> Should probably have spoken earlier, but is there any particular reason
>>> for the ugly and hard to read Makefile variable names LCLBLD and PLGCFG?
>>> I suppose they're short for LOCALBUILD and PLUGINCONFIG, but why do they
>>> have to be short for anything, it's not like we're running out of space
>>> for their names anywhere, is it? Besides, I don't think LCLBLD describes
>>> what its effects are very well, INPLACE would sounds better to me.
>>>
>>> The ship may already have sailed for plgcfg in vdr.pc as it's being used
>>> by many plugin Makefiles already, but I believe the attached patches
>>> should be safe for 2.0.0.
>>
>> I'm afraid it's too late for that.
>
> I do not understand why it should be too late.
> 2.0 is not out yet.

But we're in the final testing phase.
Besides, Ville's patch also touched the Makefiles of plugins - and
plugin authors and distribution managers react very intense when they
have to modify their files ;-).

> But if they really cannot have readable names,
> at least I would not provide a default, but  let
> the makefile issue a message that they must
> be set (as I suggested in the other thread).

Sorry, no more changes for version 2.0.
Just bugfixes, if anything is really broken.

Klaus
Manuel Reimer March 20, 2013, 3:35 p.m. UTC | #5 
Carsten Koch wrote:
> But if they really cannot have readable names,
> at least I would not provide a default, but  let
> the makefile issue a message that they must
> be set (as I suggested in the other thread).

They don't have to be set, so why should the Makefile issue a message?

Yours

Manuel
Paul Menzel March 20, 2013, 5:02 p.m. UTC | #6 
Am Sonntag, den 17.03.2013, 18:06 +0100 schrieb Klaus Schmidinger:
> On 17.03.2013 18:00, Carsten Koch wrote:
> > On 03/17/13 13:00, Klaus Schmidinger wrote:
> >> On 17.03.2013 12:46, Ville Skyttä wrote:
> >>> Hello,
> >>>
> >>> Should probably have spoken earlier, but is there any particular reason
> >>> for the ugly and hard to read Makefile variable names LCLBLD and PLGCFG?
> >>> I suppose they're short for LOCALBUILD and PLUGINCONFIG, but why do they
> >>> have to be short for anything, it's not like we're running out of space
> >>> for their names anywhere, is it? Besides, I don't think LCLBLD describes
> >>> what its effects are very well, INPLACE would sounds better to me.
> >>>
> >>> The ship may already have sailed for plgcfg in vdr.pc as it's being used
> >>> by many plugin Makefiles already, but I believe the attached patches
> >>> should be safe for 2.0.0.
> >>
> >> I'm afraid it's too late for that.
> >
> > I do not understand why it should be too late.
> > 2.0 is not out yet.
> 
> But we're in the final testing phase.
> Besides, Ville's patch also touched the Makefiles of plugins - and
> plugin authors and distribution managers react very intense when they
> have to modify their files ;-).

If I am not mistaken, Ville’s issue was that the names were not clear.
Could a comment be added to the Makefile what the meaning is then. That
should not break anything.

[…]


Thanks,

Paul
Klaus Schmidinger March 20, 2013, 5:36 p.m. UTC | #7 
On 20.03.2013 18:02, Paul Menzel wrote:
> Am Sonntag, den 17.03.2013, 18:06 +0100 schrieb Klaus Schmidinger:
>> On 17.03.2013 18:00, Carsten Koch wrote:
>>> On 03/17/13 13:00, Klaus Schmidinger wrote:
>>>> On 17.03.2013 12:46, Ville Skyttä wrote:
>>>>> Hello,
>>>>>
>>>>> Should probably have spoken earlier, but is there any particular reason
>>>>> for the ugly and hard to read Makefile variable names LCLBLD and PLGCFG?
>>>>> I suppose they're short for LOCALBUILD and PLUGINCONFIG, but why do they
>>>>> have to be short for anything, it's not like we're running out of space
>>>>> for their names anywhere, is it? Besides, I don't think LCLBLD describes
>>>>> what its effects are very well, INPLACE would sounds better to me.
>>>>>
>>>>> The ship may already have sailed for plgcfg in vdr.pc as it's being used
>>>>> by many plugin Makefiles already, but I believe the attached patches
>>>>> should be safe for 2.0.0.
>>>>
>>>> I'm afraid it's too late for that.
>>>
>>> I do not understand why it should be too late.
>>> 2.0 is not out yet.
>>
>> But we're in the final testing phase.
>> Besides, Ville's patch also touched the Makefiles of plugins - and
>> plugin authors and distribution managers react very intense when they
>> have to modify their files ;-).
>
> If I am not mistaken, Ville’s issue was that the names were not clear.
> Could a comment be added to the Makefile what the meaning is then. That
> should not break anything.

Something like this?

# Use 'make LCLBLD=1' to build locale and plugin files under the source directory:
ifdef LCLBLD
...

# Use this if you want to have a central place where you configure compile time
# parameters for plugins:
#PLGCFG = $(CONFDIR)/plugins.mk

Klaus
diff mbox

Patch

From 79a900a9995c1d401543e2804027cc019b5f7375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 17 Mar 2013 13:43:40 +0200
Subject: [PATCH 2/2] Rename PLGCFG to PLUGINCONFIG.

---
 Make.config.template             | 2 +-
 Makefile                         | 2 +-
 PLUGINS/src/dvbhddevice/Makefile | 4 ++--
 PLUGINS/src/dvbsddevice/Makefile | 4 ++--
 PLUGINS/src/epgtableid0/Makefile | 4 ++--
 PLUGINS/src/hello/Makefile       | 4 ++--
 PLUGINS/src/osddemo/Makefile     | 4 ++--
 PLUGINS/src/pictures/Makefile    | 4 ++--
 PLUGINS/src/rcu/Makefile         | 4 ++--
 PLUGINS/src/servicedemo/Makefile | 4 ++--
 PLUGINS/src/skincurses/Makefile  | 4 ++--
 PLUGINS/src/status/Makefile      | 4 ++--
 PLUGINS/src/svdrpdemo/Makefile   | 4 ++--
 newplugin                        | 4 ++--
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Make.config.template b/Make.config.template
index 40cfefe..8a04fd7 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -62,7 +62,7 @@  endif
 
 # Use this if you want to have a central place where you configure compile time
 # parameters for plugins:
-#PLGCFG = $(CONFDIR)/plugins.mk
+#PLUGINCONFIG = $(CONFDIR)/plugins.mk
 
 ### The remote control:
 
diff --git a/Makefile b/Makefile
index 91506e2..a881b03 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@  vdr.pc:
 	@echo "resdir=$(RESDIR)" >> $@
 	@echo "libdir=$(LIBDIR)" >> $@
 	@echo "locdir=$(LOCDIR)" >> $@
-	@echo "plgcfg=$(PLGCFG)" >> $@
+	@echo "plgcfg=$(PLUGINCONFIG)" >> $@
 	@echo "apiversion=$(APIVERSION)" >> $@
 	@echo "cflags=$(CFLAGS) $(CDEFINES) $(CINCLUDES) $(HDRDIR)" >> $@
 	@echo "cxxflags=$(CXXFLAGS) $(CDEFINES) $(CINCLUDES) $(HDRDIR)" >> $@
diff --git a/PLUGINS/src/dvbhddevice/Makefile b/PLUGINS/src/dvbhddevice/Makefile
index 0bfd136..c65e3b0 100644
--- a/PLUGINS/src/dvbhddevice/Makefile
+++ b/PLUGINS/src/dvbhddevice/Makefile
@@ -18,7 +18,7 @@  VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -33,7 +33,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index f7e73b2..1bde961 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -18,7 +18,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 = $(call PKGCFG,libdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -33,7 +33,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/epgtableid0/Makefile b/PLUGINS/src/epgtableid0/Makefile
index 6190e62..72ca903 100644
--- a/PLUGINS/src/epgtableid0/Makefile
+++ b/PLUGINS/src/epgtableid0/Makefile
@@ -18,7 +18,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 = $(call PKGCFG,libdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -33,7 +33,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 4bdd5c9..9cec663 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -19,7 +19,7 @@  VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -34,7 +34,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 9b7e2c1..9d63bce 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -18,7 +18,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 = $(call PKGCFG,libdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -33,7 +33,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile
index 3081e27..cb2b7ab 100644
--- a/PLUGINS/src/pictures/Makefile
+++ b/PLUGINS/src/pictures/Makefile
@@ -19,7 +19,7 @@  VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -34,7 +34,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/rcu/Makefile b/PLUGINS/src/rcu/Makefile
index 3dbecdd..61ecdc3 100644
--- a/PLUGINS/src/rcu/Makefile
+++ b/PLUGINS/src/rcu/Makefile
@@ -18,7 +18,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 = $(call PKGCFG,libdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -33,7 +33,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile
index e5ba5f5..417b890 100644
--- a/PLUGINS/src/servicedemo/Makefile
+++ b/PLUGINS/src/servicedemo/Makefile
@@ -19,7 +19,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 = $(call PKGCFG,libdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -34,7 +34,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile
index fa0ce41..0b83009 100644
--- a/PLUGINS/src/skincurses/Makefile
+++ b/PLUGINS/src/skincurses/Makefile
@@ -19,7 +19,7 @@  VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
 LIBDIR = $(call PKGCFG,libdir)
 LOCDIR = $(call PKGCFG,locdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -34,7 +34,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 8f6e26f..c84258e 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -18,7 +18,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 = $(call PKGCFG,libdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -33,7 +33,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile
index 2e39140..532db3f 100644
--- a/PLUGINS/src/svdrpdemo/Makefile
+++ b/PLUGINS/src/svdrpdemo/Makefile
@@ -18,7 +18,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 = $(call PKGCFG,libdir)
-PLGCFG = $(call PKGCFG,plgcfg)
+PLUGINCONFIG = $(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -33,7 +33,7 @@  APIVERSION = $(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include $(PLGCFG)
+-include $(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
diff --git a/newplugin b/newplugin
index 12eca5a..e035c0e 100755
--- a/newplugin
+++ b/newplugin
@@ -78,7 +78,7 @@  VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
 PKGCFG = \$(if \$(VDRDIR),\$(shell pkg-config --variable=\$(1) \$(VDRDIR)/vdr.pc),\$(shell pkg-config --variable=\$(1) vdr || pkg-config --variable=\$(1) ../../../vdr.pc))
 LIBDIR = \$(call PKGCFG,libdir)
 LOCDIR = \$(call PKGCFG,locdir)
-PLGCFG = \$(call PKGCFG,plgcfg)
+PLUGINCONFIG = \$(call PKGCFG,plgcfg)
 #
 TMPDIR ?= /tmp
 
@@ -93,7 +93,7 @@  APIVERSION = \$(call PKGCFG,apiversion)
 
 ### Allow user defined options to overwrite defaults:
 
--include \$(PLGCFG)
+-include \$(PLUGINCONFIG)
 
 ### The name of the distribution archive:
 
-- 
1.7.11.7