From c1cc6333f2c99ae9239d0d048080ac89439a088d Mon Sep 17 00:00:00 2001

From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

Date: Sat, 27 Sep 2014 10:15:50 -0300

Subject: [PATCH] Add targets to install the files at the system

In order to be easier to package the scan tables, add

some targets to install the files, and add the instructions

about how to use it at the README file.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/Makefile b/Makefile

index 2fb4a8890a37..901dc9df4595 100644

--- a/Makefile

+++ b/Makefile

@@ -14,6 +14,7 @@ MKDIR = mkdir -p

 DVBFORMATCONVERT = dvb-format-convert

 DVBV3DIRS = atsc dvb-c dvb-s dvb-t

+DVBV5DIRS = $(DVBV3DIRS) isdb-t

 DVBV3CHANNELFILES = $(foreach dir,$(DVBV3DIRS),$(wildcard $(dir)/*))

@@ -25,6 +26,22 @@ DVBV5OUTPUTDIR = dvbv5

 PHONY := clean dvbv3 dvbv5

+ifeq ($(PREFIX),)

+PREFIX = /usr/local

+endif

+

+ifeq ($(DATADIR),)

+DATADIR = $(PREFIX)/share

+endif

+

+ifeq ($(DVBV5DIR),)

+DVBV5DIR = dvbv5

+endif

+

+ifeq ($(DVBV3DIR),)

+DVBV3DIR = dvbv3

+endif

+

 dvbv3:

 	@$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV3OUTPUTDIR)/$(var);)

 	@$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) $(var) $(DVBV3OUTPUTDIR)/$(var);)

@@ -34,6 +51,13 @@ dvbv5: $(DVBV3OUTPUTDIR)

 	@$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV5OUTPUTDIR)/$(var);)

 	@$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) $(DVBV3OUTPUTDIR)/$(var) $(DVBV5OUTPUTDIR)/$(var);)

+install:

+	@mkdir -p $(DATADIR)/$(DVBV5DIR)

+	$(foreach var,$(DVBV5DIRS), install -d -p $(DATADIR)/$(DVBV5DIR)/$(var); install -D -p -m 644 $(var)/* $(DATADIR)/$(DVBV5DIR)/$(var);)

+

+install_v3:

+	@mkdir -p $(DATADIR)/$(DVBV3DIR)

+	$(foreach var,$(DVBV3DIRS), install -d -p $(DATADIR)/$(DVBV3DIR)/$(var); install -D -p -m 644 $(DVBV3OUTPUTDIR)/$(var)/* $(DATADIR)/$(DVBV3DIR)/$(var);)

 clean:

 	rm -rf $(DVBV3OUTPUTDIR)/ $(DVBV5OUTPUTDIR)/

diff --git a/README b/README

index 87561ee599ae..f0ae695aa09b 100644

--- a/README

+++ b/README

@@ -1,6 +1,9 @@

 All tables are now using DVBv5 format. That allows suporting all standards

 available on a standard way.

+GENERATING FILES TO THE LEGACY DVBV3 FORMAT

+===========================================

+

 A Makefile target is provided to convert to the legacy channel format.

 For it to work, you need to have v4l-utils installed (specifically,

 the v4l-utils package that contains the dvbv5 utils).

@@ -36,3 +39,37 @@ Plese notice that comments are not preserved when doing the conversions.

 PS.: If you're willing to submit new entries and/or corrections, please

 be sure to send them at the DVBv5 format and sending them via e-mail

 to linux-media@vger.kernel.org.

+

+INSTALL

+=======

+

+In order to install the files, use:

+	$ make install

+

+By default, it will install the files at /usr/local/share/dvbv5.

+

+In order to install the legacy v3 formatted files, use:

+	$ make install_v3

+

+Don't forget to run "make dvbv3" before running the above command,

+in order to convert the files to the legacy format.

+

+By default, it will install the files at /usr/local/share/dvbv3.

+

+There are a few extra parameters that could be used to define where

+the files will be stored:

+

+	PREFIX=<dir>		(default: /usr/local)

+	DATADIR=<dir>		(default: $(PREFIX/share)

+	DVBV5DIR=<subdir>	(default: dvbv3)

+	DVBV3DIR=<subdir>	(default: dvbv5)

+

+So, if it is desired to install both v3 and v5 files at a tmp file,

+under the current dir, the install command would be:

+

+	$ make install install_v3 PREFIX=`pwd`/tmp

+	Installing dvbv5-formatted files at /home/myuser/dtv-scan-tables/tmp/share/dvbv5...done.

+	Installing dvbv3-formatted files at /home/myuser/dtv-scan-tables/tmp/share/dvbv3...done.

+

+Please also note that install takes some time, as there are lots

+of files to be copied.