From 5727d72f708345a39e1ccda222f7643a25732191 Mon Sep 17 00:00:00 2001 From: Keine_Ahnung Date: Fri, 25 Jan 2013 21:30:41 +0100 Subject: starting the scripts, some fixes --- Makefile.1.7.x | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Makefile.1.7.x') diff --git a/Makefile.1.7.x b/Makefile.1.7.x index 3695f3b..047ad15 100644 --- a/Makefile.1.7.x +++ b/Makefile.1.7.x @@ -21,6 +21,8 @@ LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) BINDIR = $(call PKGCFG,bindir) +CFGDIR = $(call PKGCFG,configdir) + # TMPDIR ?= /tmp @@ -43,7 +45,7 @@ APIVERSION = $(call PKGCFG,apiversion) ### Default values: -PLUGIN_UACTIVITY_COMMAND?=echo vdr-uactivity -r %1$$s -o %2$$s -v %3$$s -C %4$$s -c %5$$s -R %6$$s | at now +PLUGIN_UACTIVITY_COMMAND?=vdr-uactivity -r %1$$s -o %2$$s -v %3$$s -C %4$$s -c %5$$s -R %6$$s ### The name of the distribution archive: @@ -117,7 +119,15 @@ install-lib: $(SOFILE) install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install-bin: +ifndef PLUGIN_UACTIVITY_NOINSTALL_BIN install -D script/vdr-uactivity $(DESTDIR)$(BINDIR)/vdr-uactivity + install -d $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/activity + install script/uactivity/activity/* $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/activity + install -d $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/key + install script/uactivity/key/* $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/key + install -d $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/watchdog + install script/uactivity/watchdog/* $(DESTDIR)$(CFGDIR)/plugins/$(PLUGIN)/watchdog +endif install: install-lib install-i18n install-bin -- cgit v1.2.3