diff options
| author | thlo <smarttv640@gmail.com> | 2014-04-26 09:25:00 +0200 |
|---|---|---|
| committer | thlo <smarttv640@gmail.com> | 2014-04-26 09:25:00 +0200 |
| commit | 88bfdef3ba37e603644f0e1279e73754a2769bdd (patch) | |
| tree | 9a6c7186b2a72f16568e24252a232d08a238fb2b | |
| parent | 6ee39aef2622c86e9d30dcc5371a5efd981f7f92 (diff) | |
| download | vdr-plugin-smarttvweb-88bfdef3ba37e603644f0e1279e73754a2769bdd.tar.gz vdr-plugin-smarttvweb-88bfdef3ba37e603644f0e1279e73754a2769bdd.tar.bz2 | |
Handling of Plugin conf data in Makefile.
| -rwxr-xr-x | Makefile | 9 | ||||
| -rwxr-xr-x | Makefile.new | 9 | ||||
| -rw-r--r-- | debian/install | 6 | ||||
| -rwxr-xr-x | debian/rules | 2 |
4 files changed, 23 insertions, 3 deletions
@@ -20,6 +20,7 @@ PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(s LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) +CONFDIR = $(call PKGCFG,configdir) # TMPDIR ?= /tmp @@ -105,6 +106,14 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) + @if [ ! -d $(DESTDIR)$(CONFDIR)/plugins/smarttvweb ]; then \ + @echo "Creating plugin conf dir in "$(DESTDIR)$(CONFDIR); \ + mkdir -p $(DESTDIR)$(CONFDIR)/plugins/smarttvweb; \ + cp widget.conf $(DESTDIR)$(CONFDIR)/smarttvweb; \ + cp -r web/ $(DESTDIR)$(CONFDIR)/smarttvweb; \ + cp smarttvweb.conf $(DESTDIR)$(CONFDIR)/smarttvweb; \ + chown -R vdr:vdr $(DESTDIR)$(CONFDIR)/smarttvweb; \ + fi install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib install-i18n diff --git a/Makefile.new b/Makefile.new index 3c007f9..6eb90ea 100755 --- a/Makefile.new +++ b/Makefile.new @@ -20,6 +20,7 @@ PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(s LIBDIR = $(call PKGCFG,libdir) LOCDIR = $(call PKGCFG,locdir) PLGCFG = $(call PKGCFG,plgcfg) +CONFDIR = $(call PKGCFG,configdir) # TMPDIR ?= /tmp @@ -105,6 +106,14 @@ $(SOFILE): $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ install-lib: $(SOFILE) + @if [ ! -d $(DESTDIR)$(CONFDIR)/plugins/smarttvweb ]; then \ + @echo "Creating plugin conf dir in "$(DESTDIR)$(CONFDIR); \ + mkdir -p $(DESTDIR)$(CONFDIR)/plugins/smarttvweb; \ + cp widget.conf $(DESTDIR)$(CONFDIR)/smarttvweb; \ + cp -r web/ $(DESTDIR)$(CONFDIR)/smarttvweb; \ + cp smarttvweb.conf $(DESTDIR)$(CONFDIR)/smarttvweb; \ + chown -R vdr:vdr $(DESTDIR)$(CONFDIR)/smarttvweb; \ + fi install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) install: install-lib install-i18n diff --git a/debian/install b/debian/install index 413efdb..42f2d45 100644 --- a/debian/install +++ b/debian/install @@ -1,3 +1,3 @@ -smarttvweb.conf var/lib/vdr/plugins/smarttvweb -widget.conf var/lib/vdr/plugins/smarttvweb -web/* var/lib/vdr/plugins/smarttvweb/web +#smarttvweb.conf var/lib/vdr/plugins/smarttvweb +#widget.conf var/lib/vdr/plugins/smarttvweb +#web/* var/lib/vdr/plugins/smarttvweb/web diff --git a/debian/rules b/debian/rules index e2e0b99..03fa46d 100755 --- a/debian/rules +++ b/debian/rules @@ -23,5 +23,7 @@ override_dh_auto_install: override_dh_auto_build: dh_auto_build -- all $(MAKE_OPTIONS) +override_dh_usrlocal: + %: dh $@ |