From 0263c8261416ce27e1908c1e675c2e45614f31bc Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 22 Dec 2012 12:08:31 +0100 Subject: Plugin Makefiles now use DESTDIR and the 'install' program --- PLUGINS/src/osddemo/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'PLUGINS/src/osddemo/Makefile') diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile index b6b4e9b9..607770b5 100644 --- a/PLUGINS/src/osddemo/Makefile +++ b/PLUGINS/src/osddemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 2.9 2012/12/21 11:45:26 kls Exp $ +# $Id: Makefile 2.10 2012/12/22 11:51:34 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -17,15 +17,14 @@ 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) -LOCDIR ?= $(call PKGCFG,locdir) +LIBDIR ?= $(DESTDIR)$(call PKGCFG,libdir) # TMPDIR ?= /tmp ### The compiler options: -export CFLAGS ?= $(call PKGCFG,cflags) -export CXXFLAGS ?= $(call PKGCFG,cxxflags) +export CFLAGS = $(call PKGCFG,cflags) +export CXXFLAGS = $(call PKGCFG,cxxflags) ### The version number of VDR's plugin API: @@ -74,8 +73,7 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) - @mkdir -p $(LIBDIR) - @cp --remove-destination $^ $(LIBDIR)/$^.$(APIVERSION) + install -D $^ $(LIBDIR)/$^.$(APIVERSION) install: install-lib -- cgit v1.2.3