diff options
Diffstat (limited to 'media-tv/w_scan/files/w_scan-20060903-paths.patch')
| -rw-r--r-- | media-tv/w_scan/files/w_scan-20060903-paths.patch | 115 |
1 files changed, 115 insertions, 0 deletions
diff --git a/media-tv/w_scan/files/w_scan-20060903-paths.patch b/media-tv/w_scan/files/w_scan-20060903-paths.patch new file mode 100644 index 000000000000..7a9bae20cbb0 --- /dev/null +++ b/media-tv/w_scan/files/w_scan-20060903-paths.patch @@ -0,0 +1,115 @@ +diff -r -u w_scan-20060903/Makefile w_scan-20060903.org/Makefile +--- w_scan-20060903/Makefile 2006-09-02 23:20:04.000000000 +0200 ++++ w_scan-20060903.org/Makefile 2006-09-09 22:03:24.000000000 +0200 +@@ -7,20 +7,27 @@ + SRCS = $(OBJS:.o=.c) + + TARGET = w_scan ++DESTDIR = / ++BINDIR = usr/bin ++SHAREDIR = usr/share/wscan ++DOCDIR = usr/share/doc/wscan + + $(TARGET): $(OBJS) + $(CC) $(LFLAGS) -o $(TARGET) $(OBJS) + + .c.o: +- $(CC) $(CFLAGS) --static -c $< -o $@ ++ $(CC) $(CFLAGS) -c $< -o $@ + + install: +- install -m 755 $(TARGET) /usr/bin +- install -m 755 w_scan_start.sh /usr/bin +- install pci.ids /usr/bin +- install pci.classes /usr/bin +- install usb.ids /usr/bin +- install usb.classes /usr/bin ++ @mkdir -p ${DESTDIR}${BINDIR} ++ @mkdir -p ${DESTDIR}${SHAREDIR} ++ @mkdir -p ${DESTDIR}${DOCDIR} ++ install -m 755 $(TARGET) ${DESTDIR}${BINDIR} ++ install -m 755 w_scan_start.sh ${DESTDIR}${BINDIR} ++ install pci.ids ${DESTDIR}${SHAREDIR} ++ install pci.classes ${DESTDIR}${SHAREDIR} ++ install usb.ids ${DESTDIR}${SHAREDIR} ++ install usb.classes ${DESTDIR}${SHAREDIR} + clean: + $(RM) *.o *.d $(TARGET) + +diff -r -u w_scan-20060903/w_scan_start.sh w_scan-20060903.org/w_scan_start.sh +--- w_scan-20060903/w_scan_start.sh 2006-09-02 23:23:49.000000000 +0200 ++++ w_scan-20060903.org/w_scan_start.sh 2006-09-09 21:56:00.000000000 +0200 +@@ -414,8 +414,8 @@ + read idVendor < $i/idVendor + read idProduct < $i/idProduct + # avoid errors if ressource not available +- if [ ! -e $(pwd)/usb.ids ] || +- [ ! -e $(pwd)/usb.classes ]; then ++ if [ ! -e /usr/share/w_scan/usb.ids ] || ++ [ ! -e /usr/share/w_scan/usb.classes ]; then + DEBUG_LOADDRIVER=false + fi + if [ $DEBUG_LOADDRIVER == true ]; then +@@ -424,7 +424,7 @@ + class_name=${line:6:40} + break + fi +- done < $(pwd)/usb.classes ++ done < /usr/share/w_scan/usb.classes + while read line; do + if [ "${line:0:4}" == "$idVendor" ]; then + vendor_name=${line:6:80} +@@ -438,7 +438,7 @@ + done + break + fi +- done < $(pwd)/usb.ids ++ done < /usr/share/w_scan/usb.ids + fi + while read line; do + data=$line +@@ -507,8 +507,8 @@ + read subvendor < $i/subsystem_vendor + read subdevice < $i/subsystem_device + # avoid errors if ressource not available +- if [ ! -e $(pwd)/pci.ids ] || +- [ ! -e $(pwd)/pci.classes ]; then ++ if [ ! -e /usr/share/w_scan/pci.ids ] || ++ [ ! -e /usr/share/w_scan/pci.classes ]; then + DEBUG_LOADDRIVER=false + fi + if [ $DEBUG_LOADDRIVER == true ]; then +@@ -517,7 +517,7 @@ + class_name=${line:5:40} + break + fi +- done < $(pwd)/pci.classes ++ done < /usr/share/w_scan/pci.classes + while read line; do + if [ "${line:0:4}" == "${vendor:2:4}" ]; then + vendor_name=${line:5:80} +@@ -531,13 +531,13 @@ + done + break + fi +- done < $(pwd)/pci.ids ++ done < /usr/share/w_scan/pci.ids + while read line; do + if [ "${line:0:4}" == "${subvendor:2:4}" ]; then + subvendor_name=${line:5:80} + break + fi +- done < $(pwd)/pci.ids ++ done < /usr/share/w_scan/pci.ids + fi + while read line; do + data=$line +@@ -688,7 +688,7 @@ + echo "Copying channels.conf skipped - okay." + echo "The channels.conf generated can be found at" + echo -n -e "\\033[1;34m" +- echo "$(pwd)/channels.conf-$DATE" ++ echo "/usr/share/w_scan/channels.conf-$DATE" + echo "" + echo -e -n $NORMAL + else |