diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2014-01-01 13:35:13 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2014-01-01 13:35:13 +0100 |
| commit | ea613e6b2651bedacce9413df0a9e3c80afb6c1c (patch) | |
| tree | f18e62a541dd64e8fa30ad9259299e556bee152f /PLUGINS/src/pictures | |
| parent | 16dd077fb2d9f2a352e14039cea43ebe0ffb6048 (diff) | |
| download | vdr-ea613e6b2651bedacce9413df0a9e3c80afb6c1c.tar.gz vdr-ea613e6b2651bedacce9413df0a9e3c80afb6c1c.tar.bz2 | |
Avoiding unnecessary pkg-config warnings in plugin Makefiles
Diffstat (limited to 'PLUGINS/src/pictures')
| -rw-r--r-- | PLUGINS/src/pictures/HISTORY | 4 | ||||
| -rw-r--r-- | PLUGINS/src/pictures/Makefile | 4 | ||||
| -rw-r--r-- | PLUGINS/src/pictures/pictures.c | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/PLUGINS/src/pictures/HISTORY b/PLUGINS/src/pictures/HISTORY index db566301..29879b89 100644 --- a/PLUGINS/src/pictures/HISTORY +++ b/PLUGINS/src/pictures/HISTORY @@ -91,3 +91,7 @@ VDR Plugin 'pictures' Revision History 2013-07-01: - Added option -x to pic2mpg. + +2014-01-01: Version 2.1.1 + +- Avoiding unnecessary pkg-config warnings in plugin Makefiles. diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile index 3081e27d..912e3d97 100644 --- a/PLUGINS/src/pictures/Makefile +++ b/PLUGINS/src/pictures/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 2.18 2013/01/12 13:45:01 kls Exp $ +# $Id: Makefile 3.1 2014/01/01 13:29:54 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -16,7 +16,7 @@ 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)) +PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell PKG_CONFIG_PATH="$$PKG_CONFIG_PATH:../../.." pkg-config --variable=$(1) vdr)) LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) diff --git a/PLUGINS/src/pictures/pictures.c b/PLUGINS/src/pictures/pictures.c index 7a46a5f3..d3ff8ff6 100644 --- a/PLUGINS/src/pictures/pictures.c +++ b/PLUGINS/src/pictures/pictures.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: pictures.c 2.9 2013/03/31 09:30:18 kls Exp $ + * $Id: pictures.c 3.1 2014/01/01 13:29:54 kls Exp $ */ #include <getopt.h> @@ -11,7 +11,7 @@ #include "menu.h" #include "player.h" -static const char *VERSION = "2.0.0"; +static const char *VERSION = "2.1.1"; static const char *DESCRIPTION = trNOOP("A simple picture viewer"); static const char *MAINMENUENTRY = trNOOP("Pictures"); |