diff options
-rw-r--r-- | Makefile | 6 | ||||
-rwxr-xr-x | debian/rules | 4 | ||||
-rw-r--r-- | debian/vdr-plugin-webvideo.install | 2 |
3 files changed, 5 insertions, 7 deletions
@@ -26,7 +26,7 @@ all-noinstall: libwebvi vdr-plugin all: libwebvi vdr-plugin $(LIBDIR)/libvdr-webvideo.so.$(APIVERSION) webvi.conf vdr-plugin: libwebvi - $(MAKE) -C src/vdr-plugin LOCALEDIR=./locale LIBDIR=. VDRDIR=$(VDRDIR) CXXFLAGS="-fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses $(CXXFLAGS)" + $(MAKE) -C src/vdr-plugin LOCALEDIR=./locale LIBDIR=. VDRDIR=$(VDRDIR) CXXFLAGS="-fPIC -Woverloaded-virtual -Wno-parentheses $(CXXFLAGS)" libwebvi: build-python $(MAKE) -C src/libwebvi all libwebvi.a @@ -37,11 +37,11 @@ build-python: webvi.conf webvi.conf webvi.plugin.conf: %.conf: examples/%.conf sed 's_templatepath = /usr/local/share/webvi/templates_templatepath = $(PREFIX)/share/webvi/templates_g' < $< > $@ -$(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION): vdr-plugin +$(DESTDIR)$(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION): vdr-plugin mkdir -p $(DESTDIR)$(VDRPLUGINDIR) cp -f src/vdr-plugin/libvdr-webvideo.so.$(APIVERSION) $(DESTDIR)$(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION) -install-vdr-plugin: vdr-plugin $(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION) +install-vdr-plugin: $(DESTDIR)$(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION) mkdir -p $(DESTDIR)$(VDRLOCALEDIR) cp -rf src/vdr-plugin/locale/* $(DESTDIR)$(VDRLOCALEDIR) mkdir -p $(DESTDIR)$(VDRPLUGINCONFDIR)/webvideo diff --git a/debian/rules b/debian/rules index 44d5f4a..01c7339 100755 --- a/debian/rules +++ b/debian/rules @@ -11,10 +11,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/python-distutils.mk -DEB_COMPRESS_EXCLUDE := .py - DEB_MAKE_BUILD_TARGET := all-noinstall VDRDIR=/usr/include/vdr -DEB_MAKE_INSTALL_TARGET := install-vdr-plugin install-python VDRDIR=/usr/include/vdr PREFIX=$(CURDIR)/debian/tmp/usr VDRPLUGINDIR=$(CURDIR)/debian/tmp/usr/lib/vdr/plugins VDRPLUGINCONFDIR=$(CURDIR)/debian/tmp/var/lib/vdr/plugins VDRLOCALEDIR=$(CURDIR)/debian/tmp/usr/share/locale +DEB_MAKE_INSTALL_TARGET := install-vdr-plugin install-python DESTDIR=$(CURDIR)/debian/tmp/ PREFIX=/usr VDRDIR=/usr/include/vdr VDRPLUGINDIR=/usr/lib/vdr/plugins VDRLOCALEDIR=/usr/share/locale VDRPLUGINCONFDIR=/var/lib/vdr/plugins DEB_MAKE_CHECK_TARGET = DEB_INSTALL_CHANGELOGS_ALL = HISTORY diff --git a/debian/vdr-plugin-webvideo.install b/debian/vdr-plugin-webvideo.install index b9cecb7..0cf0829 100644 --- a/debian/vdr-plugin-webvideo.install +++ b/debian/vdr-plugin-webvideo.install @@ -3,4 +3,4 @@ debian/tmp/usr/share/locale debian/tmp/var/lib/vdr/plugins/webvideo debian/plugin.webvideo.conf etc/vdr/plugins/ src/vdr-plugin/mime.types var/lib/vdr/plugins/webvideo/ -examples/webvi.plugin.conf var/lib/vdr/plugins/webvideo/ +debian/webvi.plugin.conf var/lib/vdr/plugins/webvideo/ |