diff options
| author | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2020-03-29 15:11:31 +0200 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2020-03-29 16:45:17 +0200 |
| commit | fe3ec4884ed4ca061cfd5dcc6e4063aec740b17b (patch) | |
| tree | d23f7590bf6b0045e5e1e0b1ec09e42f2078094b /Makefile | |
| parent | aa87f2301abb46fe501cf07bd8bae3f06a1b8f7a (diff) | |
| download | skin-lcarsng-fe3ec4884ed4ca061cfd5dcc6e4063aec740b17b.tar.gz skin-lcarsng-fe3ec4884ed4ca061cfd5dcc6e4063aec740b17b.tar.bz2 | |
Install fix
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 7 insertions, 12 deletions
@@ -18,25 +18,24 @@ 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) +PLGCFG = $(call PKGCFG,plgcfg) VDRCONFDIR = $(call PKGCFG,configdir) -PLGRESDIR = $(call PKGCFG,resdir)/plugins/$(PLUGIN) TMPDIR ?= /tmp ### The compiler options: export CFLAGS = $(call PKGCFG,cflags) export CXXFLAGS = $(call PKGCFG,cxxflags) +### The version number of VDR's plugin API: +APIVERSION = $(call PKGCFG,apiversion) + ### Allow user defined options to overwrite defaults: -include $(PLGCFG) -### The version number of VDR's plugin API: -APIVERSION = $(call PKGCFG,apiversion) - ### The name of the distribution archive: ARCHIVE = $(PLUGIN)-$(VERSION) @@ -71,7 +70,7 @@ all: $(SOFILE) i18n MAKEDEP = $(CXX) -MM -MG DEPFILE = .dependencies $(DEPFILE): Makefile - @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ + @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ -include $(DEPFILE) @@ -119,11 +118,7 @@ install-themes: mkdir -p $(DESTDIR)$(VDRCONFDIR)/themes cp themes/* $(DESTDIR)$(VDRCONFDIR)/themes -install-icons: - mkdir -p $(DESTDIR)$(PLGRESDIR)/icons - cp -r icons/* $(DESTDIR)$(PLGRESDIR)/icons - -install: install-lib install-i18n install-themes install-icons +install: install-lib install-i18n install-themes dist: $(I18Npo) clean @-rm -rf $(TMPDIR)/$(ARCHIVE) |