[linux-dvb] [PATCH] don't install dvb_net.{sh,pl}

[Ludwig Nussel <ludwig.nussel@suse.de>]

Hi,

dvb_net.sh and dvb_net.sh get installed into $libdir/dvb. They
contain IP addresses so I suppose one needs to edit them to be able
to actually use them. Since editing non-config files is bad from a
package's point of view I suggest to not install them (the current
install target also breaks the scripts as it removes the blank in
front of the first parameter).

Index: dvb-apps/util/dvbnet/Makefile
===================================================================
--- dvb-apps.orig/util/dvbnet/Makefile
+++ dvb-apps/util/dvbnet/Makefile
@@ -26,13 +26,7 @@
 	test "$(bindir)/" != "/"
 	mkdir -p $(DESTDIR)$(bindir)/
 	install -m 755 $(TARGET) $(DESTDIR)$(bindir)/
-NETSTART_SCRIPTS = net_start.pl net_start.sh
-install-scripts: 
-	test "$(libdir)/" != "/"
-	mkdir -p $(DESTDIR)$(libdir)/dvb/
-	for i in $(NETSTART_SCRIPTS) ; do cat $$i | sed -e \
-	's|[.]/dvbnet |$(bindir)/dvbnet|' > $(DESTDIR)/$(libdir)/dvb/$$i \
-	; chmod +x $(DESTDIR)/$(libdir)/dvb/$$i ; done
+install-scripts:
 
 clean:
 	rm -f $(TARGET) $(OBJS) version.h core* *~ *.d
Index: dvb-apps/util/dvbnet/net_start.sh
===================================================================
--- dvb-apps.orig/util/dvbnet/net_start.sh
+++ dvb-apps/util/dvbnet/net_start.sh
@@ -4,7 +4,7 @@
 DEV_NAME=dvb0_0
 IP_ADDR=10.1.1.1
 
-./dvbnet -p $PID
+dvbnet -p $PID
 
 /sbin/ifconfig $DEV_NAME $IP_ADDR
 
Index: dvb-apps/util/dvbnet/net_start.pl
===================================================================
--- dvb-apps.orig/util/dvbnet/net_start.pl
+++ dvb-apps/util/dvbnet/net_start.pl
@@ -12,7 +12,7 @@
 {
   local ($ADAPTER, $NETDEV, $PID, $IP_ADDR) = @_;
 
-  $DEV_NAME = `./dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`;
+  $DEV_NAME = `dvbnet -a $ADAPTER -n $NETDEV -p $PID | grep created`;
   chop($DEV_NAME);
 
   $DEV_NAME =~ s/(.*)device //;

cu
Ludwig

-- 
 (o_   Ludwig Nussel
 //\   SUSE LINUX AG, Development
 V_/_  http://www.suse.de/