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/pictures/Makefile | |
| 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/pictures/Makefile')
| -rw-r--r-- | PLUGINS/src/pictures/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/PLUGINS/src/pictures/Makefile b/PLUGINS/src/pictures/Makefile index d04378ee..ed5bdb92 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.13 2012/12/21 11:37:07 kls Exp $ +# $Id: Makefile 2.14 2012/12/22 11:51:44 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,15 @@ 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) +LOCDIR ?= $(DESTDIR)$(call PKGCFG,locdir) # 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: @@ -87,8 +87,7 @@ $(I18Npot): $(wildcard *.c) @touch $@ $(I18Nmsgs): $(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo - @mkdir -p $(dir $@) - cp $< $@ + install -D -m644 $< $@ .PHONY: i18n i18n: $(I18Nmo) $(I18Npot) @@ -101,8 +100,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 install-i18n |