diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2012-12-22 12:08:31 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-12-22 12:08:31 +0100 |
| commit | 0263c8261416ce27e1908c1e675c2e45614f31bc (patch) | |
| tree | 7a9e240db3ddd27f75984ddb42023acb78535f91 /PLUGINS/src/servicedemo | |
| parent | 4e87443a2dcf807f3a1931613a519a7c240bc717 (diff) | |
| download | vdr-0263c8261416ce27e1908c1e675c2e45614f31bc.tar.gz vdr-0263c8261416ce27e1908c1e675c2e45614f31bc.tar.bz2 | |
Plugin Makefiles now use DESTDIR and the 'install' program
Diffstat (limited to 'PLUGINS/src/servicedemo')
| -rw-r--r-- | PLUGINS/src/servicedemo/Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile index 79f879b5..e308f7db 100644 --- a/PLUGINS/src/servicedemo/Makefile +++ b/PLUGINS/src/servicedemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 2.7 2012/12/20 13:35:20 kls Exp $ +# $Id: Makefile 2.8 2012/12/22 11:51:55 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -18,15 +18,14 @@ 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) -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,9 +73,8 @@ libvdr-$(PLUGIN2).so: $(PLUGIN2).o $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(PLUGIN2).o -o $@ install: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so - @mkdir -p $(LIBDIR) - @cp --remove-destination libvdr-$(PLUGIN1).so $(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION) - @cp --remove-destination libvdr-$(PLUGIN2).so $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION) + install -D libvdr-$(PLUGIN1).so $(LIBDIR)/libvdr-$(PLUGIN1).so.$(APIVERSION) + install -D libvdr-$(PLUGIN2).so $(LIBDIR)/libvdr-$(PLUGIN2).so.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) |