[linux-dvb] Re: linuxtv-dvb-apps-1.1.0 install patches

[Guido Draheim <guidod-2003-@gmx.de>]

Ludwig Nussel wrote:
> Johannes Stezenbach wrote:
>
> > Guido Draheim wrote:
> >
> > > Furthermore, I did add install-etc extra targets that do not only
> > > handle bindir files - there are some files like *.rc5 and the
> > > series of channels.conf-* that should be present in the non-source
> > > installation to be usable by users. At the moment I did just push
> > > them to $(sysconfdir)/dvb/* which might not be the best place but
> > > at the same time it makes it easy to tell users where to look for
> > > them in their rpm installation.
> > IMHO that's the wrong place. These files should either go
> > to /usr/share/dvb/ or /usr/lib/dvb/, or maybe even
> > /usr/share/docs/dvb/exaples/.
> >
> > I will apply your patch anyway (because I don't care that
> > much about LSB compliance), but a follow-up patch that
> > corrects the locations will gladly be accepted.
>
> JFYI, the SUSE rpm puts the remote config files in
> /usr/share/av7110_loadkeys, include files in /usr/include/dvb and
> the test programs in /usr/lib/dvb/test. The channels.conf* and scan
> config files are just in /usr/share/doc/packages/dvb.
but I do not like that data-locations here, instead I'd put them as
*.rc5 *.rcmm  -> /usr/share/dvb/av7110_loadkeys/
                            ^^^ <- the difference
*configs      -> /usr/share/dvb/dvb-?/
*channel.conf -> /usr/share/dvb/

patch attached...
-- guido                                  http://google.de/search?q=guidod
GCS/E/S/P C++/++++$ ULHS L++w- N++@ s+:a d(+-) r+@>+++ y++ 5++X- (geekcode)
Index: util/scan/Makefile
===================================================================
RCS file: /cvs/linuxtv/dvb-apps/util/scan/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- util/scan/Makefile	14 Feb 2004 22:04:52 -0000	1.4
+++ util/scan/Makefile	14 Feb 2004 23:53:01 -0000
@@ -4,7 +4,7 @@
 CPPFLAGS = -MD -I../../include -I../lib
 LFLAGS = -g -Wall
 bindir = /usr/local/bin
-sysconfdir = /usr/local/etc
+datadir = /usr/local/share
 
 OBJS = diseqc.o dump-zap.o dump-vdr.o scan.o ../lib/lnb.o
 SRCS = $(OBJS:.o=.c)
@@ -20,17 +20,17 @@
 clean:
 	$(RM) *.o *.d $(TARGET)
 
-install: install-bin install-etc
+install: install-bin install-data
 install-bin:
 	test "$(bindir)/" != "/"
 	mkdir -p $(DESTDIR)$(bindir)/
 	for i in $(TARGETS) ; do cp $$i $(DESTDIR)$(bindir)/ ; done
-install-etc:
-	test "$(sysconfdir)/" != "/"
-	mkdir -p $(DESTDIR)$(sysconfdir)/dvb
+install-data:
+	test "$(datadir)/" != "/"
+	mkdir -p $(DESTDIR)$(datadir)/dvb
 	for d in dvb-* ; do test -d $$d || continue ; echo ..... $$d ..... \
-	; mkdir -p $(DESTDIR)$(sysconfdir)/dvb/$$d/ \
-	; cp `find $$d -type f` $(DESTDIR)$(sysconfdir)/dvb/$$d/ ; done
+	; mkdir -p $(DESTDIR)$(datadir)/dvb/$$d/ \
+	; cp `find $$d -type f` $(DESTDIR)$(datadir)/dvb/$$d/ ; done
 
 -include $(wildcard *.d) dummy
 
Index: util/szap/Makefile
===================================================================
RCS file: /cvs/linuxtv/dvb-apps/util/szap/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- util/szap/Makefile	14 Feb 2004 22:04:52 -0000	1.3
+++ util/szap/Makefile	14 Feb 2004 23:53:01 -0000
@@ -4,7 +4,7 @@
 LFLAGS = -Wall -g -O2
 RM = rm -f
 bindir = /usr/local/bin
-sysconfdir = /usr/local/etc
+datadir = /usr/local/share
 
 TARGETS = szap tzap czap femon
 OBJS = szap.o tzap.o czap.o femon.o
@@ -34,15 +34,15 @@
 clean:
 	$(RM) $(TARGETS) core* *.o *.d .depend
 
-install: install-bin install-etc
+install: install-bin install-data
 install-bin:
 	test "$(bindir)/" != "/"
 	mkdir -p $(DESTDIR)$(bindir)/
 	for i in $(TARGETS) ; do cp $$i $(DESTDIR)$(bindir)/ ; done
-install-etc:
-	test "$(sysconfdir)/" != "/"
-	mkdir -p $(DESTDIR)$(sysconfdir)/dvb
-	for i in channels.conf-* ; do cp $$i $(DESTDIR)$(sysconfdir)/dvb ; done
+install-data:
+	test "$(datadir)/" != "/"
+	mkdir -p $(DESTDIR)$(datadir)/dvb
+	for i in channels.conf-* ; do cp $$i $(DESTDIR)$(datadir)/dvb ; done
 
 -include $(wildcard *.d) dummy
 
Index: util/av7110_loadkeys/Makefile
===================================================================
RCS file: /cvs/linuxtv/dvb-apps/util/av7110_loadkeys/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- util/av7110_loadkeys/Makefile	14 Feb 2004 22:04:52 -0000	1.2
+++ util/av7110_loadkeys/Makefile	14 Feb 2004 23:53:02 -0000
@@ -1,6 +1,7 @@
 CC = gcc
 CFLAGS = -g -Wall -O2
 bindir  = /usr/local/bin
+datadir = /usr/local/share
 
 all: av7110_loadkeys evtest
 
@@ -47,5 +48,9 @@
 clean:
 	$(RM) core* *.o input_keynames.h av7110_loadkeys evtest
 
-install: av7110_loadkeys
+install: install-bin install-data
+install-bin: av7110_loadkeys
 	install -m 755 av7110_loadkeys $(DESTDIR)$(bindir)
+install-data:
+	mkdir -p $(DESTDIR)$(datadir)/dvb/av7110_loadkeys
+	cp *.rc5 *.rcmm $(DESTDIR)$(datadir)/dvb/av7110_loadkeys/