Mailing List archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linux-dvb] linuxtv-dvb-apps-1.1.0 install patches
Actually, almost all subdirectories of linuxtv-dvb-apps-1.1.0 did not
have any `make install` target at all. The patches do append such
targets and enough of them that you can do `make install` from the
toplevel directory.
While being there, some targets did have a `make install` but they
were using `$(DESTDIR)` universally which puts packagers into a little
conflict since it is (a) not specific for the target placed and
(b) DESTDIR is usually used as the prefix for the staging area.
Effectivly, I did rename the target place variable, usually that was
s/DESTDIR/bindir/.
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.
At the moment, the rpm macro will make sysconfdir=/etc, so my
current install tree looks like this:
$ ls -RF /etc/dvb/
/etc/dvb/:
channels.conf-dvbc-berlin channels.conf-dvbt-sandy_heath
channels.conf-dvbs-astra dvb-c/
channels.conf-dvbt-australia dvb-s/
channels.conf-dvbt-berlin dvb-t/
channels.conf-dvbt-collserola loadkeys/
channels.conf-dvbt-crystal-palace modules.conf
channels.conf-dvbt-hannington modules.devel
channels.conf-dvbt-madrid modules.tmp1
channels.conf-dvbt-oxford modules.tmp2
channels.conf-dvbt-reigate
/etc/dvb/dvb-c:
at-Vienna ch-unknown de-Berlin de-iesy fi-3ktv fi-vaasa-oncable
/etc/dvb/dvb-s:
Astra-19.2E Hotbird-13.0E Sirius-5.0E Telstar12-15.0W Turksat-42.0E
Hispasat-30.0W PAS-43.0W Telecom2-8.0W Thor-1.0W
/etc/dvb/dvb-t:
au-canberra fi-Espoo uk-BlackHill uk-Reigate
au-Darwin fi-Tampere uk-CrystalPalace uk-Rowridge
au-sydney_north_shore fi-Turku uk-Hannington uk-SandyHeath
au-unknown nl-AlphenaandenRijn uk-Oxford uk-Storeton
de-Berlin nl-Randstad uk-PontopPike uk-WinterHill
es-Collserola se-Gavle uk-Redruth
/etc/dvb/loadkeys:
hauppauge_grey.rc5 mbo_81095-code_562.rc5 medion_155.rc5 philips.rc5
hauppauge.rc5 medion_088.rc5 philips1358.rc5
cheers,
-- guido http://google.de/search?q=guidod
GCS/E/S/P C++/++++$ ULHS L++w- N++@ s+:a d(+-) r+@>+++ y++ 5++X- (geekcode)
--- util/dvbdate/Makefile.orig 2004-01-17 17:59:46.000000000 +0100
+++ util/dvbdate/Makefile 2004-02-13 22:03:13.000000000 +0100
@@ -5,7 +5,7 @@
OBJS = dvbdate.o
TARGET = dvbdate
-DESTDIR = /usr/local/bin/
+bindir = /usr/local/bin/
all: $(TARGET)
@@ -16,7 +16,7 @@
$(CC) -o $@ $(OBJS) $(LFLAGS)
install: all
- install -m 755 $(TARGET) $(DESTDIR)
+ install -m 755 $(TARGET) $(DESTDIR)$(bindir)
clean:
rm -f $(TARGET) $(OBJS) core* *~ *.d
--- util/dvbnet/Makefile.orig 2004-01-17 17:59:46.000000000 +0100
+++ util/dvbnet/Makefile 2004-02-13 22:02:20.000000000 +0100
@@ -5,7 +5,7 @@
OBJS = dvbnet.o
TARGET = dvbnet
-DESTDIR = /usr/local/bin/
+bindir = /usr/local/bin/
all: version.h $(TARGET)
@@ -19,8 +19,18 @@
printf '#define VERSION_INFO "%s (Build %s)"\n' \
"`cat $@.in`" "`date +'%a %b %d %X %Y'`" > $@
-install: all
- install -m 755 $(TARGET) $(DESTDIR)
+install: install-bin
+install-bin: all
+ test "$(bindir)/" != "/"
+ mkdir -p $(DESTDIR)$(bindir)/
+ install -m 755 $(TARGET) $(DESTDIR)$(bindir)/
+NETSTART_SCRIPTS = net_start.pl net_start.sh
+install-etc:
+ test "$(sysconfdir)/" != "/"
+ mkdir -p $(DESTDIR)$(sysconfdir)/dvb/
+ for i in $(NETSTART_SCRIPTS) ; do cat $$i | sed -e \
+ 's|[.]/dvbnet |$(bindir)/dvbnet|' > $(DESTDIR)/$(sysconfdir)/dvb/$$i \
+ ; chmod +x $(DESTDIR)/$(sysconfdir)/dvb/$$i ; done
clean:
rm -f $(TARGET) $(OBJS) version.h core* *~ *.d
--- util/dvbtraffic/Makefile.orig 2004-01-19 18:10:16.000000000 +0100
+++ util/dvbtraffic/Makefile 2004-02-13 21:54:08.000000000 +0100
@@ -4,3 +4,10 @@
clean:
rm -f *.o *.d dvbtraffic
+
+DVBTARGETS = dvbtraffic
+install: install-bin
+install-bin:
+ test "$(bindir)/" != "/"
+ mkdir -p $(DESTDIR)$(bindir)/
+ for i in $(DVBTARGETS) ; do cp $$i $(DESTDIR)$(bindir)/$$i ; done
--- util/lib/Makefile.orig 2004-01-17 17:59:46.000000000 +0100
+++ util/lib/Makefile 2004-02-13 22:24:26.000000000 +0100
@@ -16,5 +16,7 @@
clean:
$(RM) *.o *.d $(TARGET)
+install:
+
-include $(wildcard *.d) dummy
--- util/scan/Makefile.orig 2004-01-17 17:59:46.000000000 +0100
+++ util/scan/Makefile 2004-02-13 22:13:34.000000000 +0100
@@ -17,5 +17,17 @@
clean:
$(RM) *.o *.d $(TARGET)
+install: install-bin install-etc
+install-bin:
+ test "$(bindir)/" != "/"
+ mkdir -p $(DESTDIR)$(bindir)/
+ for i in $(TARGETS) ; do cp $$i $(DESTDIR)$(bindir)/dvb_$$i ; done
+install-etc:
+ test "$(sysconfdir)/" != "/"
+ mkdir -p $(sysconfdir)/dvb
+ for d in dvb-* ; do test -d $$d || continue ; echo ..... $$d ..... \
+ ; mkdir -p $(DESTDIR)$(sysconfdir)/dvb/$$d/ \
+ ; cp $$d/* $(DESTDIR)$(sysconfdir)/dvb/$$d/ ; done
+
-include $(wildcard *.d) dummy
--- util/szap/Makefile.orig 2004-01-17 17:59:46.000000000 +0100
+++ util/szap/Makefile 2004-02-13 22:12:43.000000000 +0100
@@ -31,5 +31,15 @@
clean:
$(RM) $(TARGETS) core* *.o *.d .depend
+install: install-bin install-etc
+install-bin:
+ test "$(bindir)/" != "/"
+ mkdir -p $(DESTDIR)$(bindir)/
+ for i in $(TARGETS) ; do cp $$i $(DESTDIR)$(bindir)/dvb_$$i ; done
+install-etc:
+ test "$(sysconfdir)/" != "/"
+ mkdir -p $(DESTDIR)$(sysconfdir)/dvb
+ for i in channels.conf-* ; do cp $$i $(DESTDIR)$(sysconfdir)/dvb ; done
+
-include $(wildcard *.d) dummy
--- test/Makefile.orig 2004-02-13 21:40:20.000000000 +0100
+++ test/Makefile 2004-02-13 21:42:11.000000000 +0100
@@ -35,3 +35,8 @@
clean:
rm -f $(TARGETS) *.o
+install:
+ test "$(bindir)/" != "/"
+ mkdir -p $(DESTDIR)$(bindir)/
+ for i in $(TARGETS) ; do cp $$i $(DESTDIR)$(bindir)/dvb_$$i ; done
+
Home |
Main Index |
Thread Index