1 |
hd_brummy 09/05/02 18:28:38 |
2 |
|
3 |
Added: w_scan-20090502-build-and-path-fixes.patch |
4 |
Log: |
5 |
new developer branch |
6 |
(Portage version: 2.1.6.11/cvs/Linux i686, RepoMan options: --force) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-tv/w_scan/files/w_scan-20090502-build-and-path-fixes.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/w_scan/files/w_scan-20090502-build-and-path-fixes.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-tv/w_scan/files/w_scan-20090502-build-and-path-fixes.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: w_scan-20090502-build-and-path-fixes.patch |
15 |
=================================================================== |
16 |
* Honour CC, CFLAGS, LDFLAGS and DESTDIR. |
17 |
* Use absolute paths so it doesn't assume w_scan is ran from the build dir. |
18 |
* Joerg Bornkessel <hd_brummy@g.o> 2009 May 02 |
19 |
diff -Naur w_scan-20090502.orig/Makefile w_scan-20090502/Makefile |
20 |
--- w_scan-20090502.orig/Makefile 2009-05-02 15:51:09.203776903 +0200 |
21 |
+++ w_scan-20090502/Makefile 2009-05-02 15:55:27.847392092 +0200 |
22 |
@@ -1,7 +1,7 @@ |
23 |
|
24 |
-CC = gcc |
25 |
-CFLAGS = -MD -g -Wall -O2 |
26 |
-LFLAGS = -g -Wall |
27 |
+CC ?= gcc |
28 |
+CFLAGS ?= -MD -g -Wall -O2 |
29 |
+LDFLAGS ?= -g -Wall |
30 |
|
31 |
OBJS = dump-vdr.o dump-xine.o dump-dvbscan.o dump-kaffeine.o scan.o section.o atsc_psip_section.o countries.o |
32 |
OBJS += dvbscan.o parse-dvbscan.o descriptors.o satellites.o lnb.o diseqc.o |
33 |
@@ -12,6 +12,9 @@ |
34 |
OLDVERSION = $(shell sed -n '/SCRIPT_VERSION="/p' w_scan_start.sh | sed -e 's/SCRIPT_VERSION=//' | sed -e 's/;//') |
35 |
TMPDIR = w_scan-$(VERSION) |
36 |
|
37 |
+BINDIR = /usr/bin |
38 |
+SHAREDIR = /usr/share/w_scan |
39 |
+ |
40 |
$(TARGET): $(OBJS) |
41 |
$(CC) $(LFLAGS) -o $(TARGET) $(OBJS) |
42 |
$(RM) *.o *.d |
43 |
@@ -40,13 +44,13 @@ |
44 |
echo "" >> version.h |
45 |
|
46 |
install: |
47 |
- install -m 755 $(TARGET) /usr/bin |
48 |
- install -m 755 w_scan_start.sh /usr/bin |
49 |
- mkdir -p /usr/share/w_scan |
50 |
- install pci.ids /usr/share/w_scan |
51 |
- install pci.classes /usr/share/w_scan |
52 |
- install usb.ids /usr/share/w_scan |
53 |
- install usb.classes /usr/share/w_scan |
54 |
+ @mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(SHAREDIR) |
55 |
+ install -m 755 $(TARGET) $(DESTDIR)$(BINDIR) |
56 |
+ install -m 755 w_scan_start.sh $(DESTDIR)$(BINDIR) |
57 |
+ install pci.ids $(DESTDIR)$(SHAREDIR) |
58 |
+ install pci.classes $(DESTDIR)$(SHAREDIR) |
59 |
+ install usb.ids $(DESTDIR)$(SHAREDIR) |
60 |
+ install usb.classes $(DESTDIR)$(SHAREDIR) |
61 |
|
62 |
dist: version scriptversion createpackage |