aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2014-01-21 00:53:33 +0100
committerJoerg Bornkessel <hd_brummy@gentoo.org>2014-01-21 00:53:33 +0100
commit7b0b9a8211a4a05df8151067ba5805fb60220f3f (patch)
tree0e40aa48b9763673215e108d1f2e7fa2e9f232ab
parentmoved systemd helper scripts in own system-dir (diff)
downloadgentoo-vdr-scripts-7b0b9a8211a4a05df8151067ba5805fb60220f3f.tar.gz
gentoo-vdr-scripts-7b0b9a8211a4a05df8151067ba5805fb60220f3f.tar.bz2
gentoo-vdr-scripts-7b0b9a8211a4a05df8151067ba5805fb60220f3f.zip
something goes wrong with last commit, again
-rw-r--r--ChangeLog4
-rw-r--r--Makefile8
-rw-r--r--usr/share/vdr/Makefile2
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2089d4c..1fbd840 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gentoo-vdr-scripts
# $Id$
+ 20 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> Makefile,
+ usr/share/vdr/Makefile:
+ something goes wrong with last commit, again
+
20 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+usr/share/vdr/systemd/Makefile,
+usr/share/vdr/systemd/vdr-systemd_helper.sh,
diff --git a/Makefile b/Makefile
index 7b69da6..22bef0e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,14 @@
SHELL = /bin/bash
-# systemd support
-VDRSYSTEMD ?= 0
+## systemd support
+#VDRSYSTEMD ?= 0
SUBDIRS = etc usr vdrplugin-rebuild
-ifeq ($(VDRSYSTEMD),1)
+#ifeq ($(VDRSYSTEMD),1)
SUBDIRS += etc/systemd/system/vdr.service.d usr/lib/systemd/system var/vdr/tmp
-endif
+#endif
all:
diff --git a/usr/share/vdr/Makefile b/usr/share/vdr/Makefile
index 4b0b7a9..a045a3e 100644
--- a/usr/share/vdr/Makefile
+++ b/usr/share/vdr/Makefile
@@ -3,7 +3,7 @@
SHELL = /bin/bash
MYDIR = $(DESTDIR)/usr/share/vdr
-SUBDIRS = bin inc rcscript record shutdown dvdchanger
+SUBDIRS = bin inc rcscript record shutdown dvdchanger systemd
BINS =
CONFS =