[vdr-plugin-xineliboutput] 05/05: Fixed build

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr-plugin-xineliboutput.

commit c7bc02f6ee21f8fe9fbbe211ce0ddbbc925a7a85
Author: etobi <git at e-tobi.net>
Date:   Wed Feb 11 22:06:31 2015 +0100

    Fixed build
---
 debian/patches/Makfile-fixes.patch | 22 ++++++++++++++++++++++
 debian/patches/series              |  1 +
 debian/rules                       |  6 ------
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/debian/patches/Makfile-fixes.patch b/debian/patches/Makfile-fixes.patch
new file mode 100644
index 0000000..5647938
--- /dev/null
+++ b/debian/patches/Makfile-fixes.patch
@@ -0,0 +1,22 @@
+Index: vdr-plugin-xineliboutput/Makefile
+===================================================================
+--- vdr-plugin-xineliboutput.orig/Makefile	2015-02-11 21:53:07.170652840 +0100
++++ vdr-plugin-xineliboutput/Makefile	2015-02-11 22:39:02.663204016 +0100
+@@ -297,7 +297,7 @@
+ $(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+ ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes)
+ 	@echo Installing $^
+-	install -D -m644 $< $@
++	install -D -m644 -t $@ $<
+ endif
+ 
+ .PHONY: i18n
+@@ -343,7 +343,7 @@
+ install-lib: $(TARGETS_VDR)
+ ifeq ($(XINELIBOUTPUT_VDRPLUGIN), yes)
+ 	@echo Installing $^
+-	install -D $^ $(DESTDIR)$(LIBDIR)/
++	install -D -t $(DESTDIR)$(LIBDIR)/ $^
+ endif
+ 
+ install: install-lib install-i18n
diff --git a/debian/patches/series b/debian/patches/series
index 45fc371..25f237d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-segfault.patch
+Makfile-fixes.patch
diff --git a/debian/rules b/debian/rules
index 298160b..4deadda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=/usr/lib LOCALEDIR=debian/tmp/usr/share/locale \
-               NOSIGNAL_IMAGE_FILE=/usr/share/libxine2-xvdr/nosignal.mpg
-
-CXXFLAGS += $(shell pkg-config vdr --variable=cxxflags)
-CFLAGS += $(shell pkg-config vdr --variable=cflags)
-
 %:
 	dh $@
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr-plugin-xineliboutput.git