blob: 9da18dd1c3f00e2062bbc3a2236aa825973b3c59 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
--- Makefile.org 2003-03-11 21:30:41.000000000 +0000
+++ Makefile 2003-03-11 21:47:14.000000000 +0000
@@ -16,8 +16,8 @@
DVBDIR = ../DVB
DTVDIR = ./libdtv
-MANDIR = /usr/local/man
-BINDIR = /usr/local/bin
+MANDIR = /usr/man
+BINDIR = /usr/bin
PLUGINDIR= ./PLUGINS
@@ -117,12 +117,18 @@
# Install the files:
install:
- @cp vdr runvdr $(BINDIR)
- @gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz
- @gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz
+ @mkdir -p $(DESTDIR)$(BINDIR)
+ @mkdir -p $(BINDIR)
+ @cp vdr runvdr $(DESTDIR)$(BINDIR)
+ @mkdir -p $(DESTDIR)$(MANDIR)/man1
+ @mkdir -p $(DESTDIR)$(MANDIR)/man5
+ @mkdir -p $(MANDIR)/man1
+ @mkdir -p $(MANDIR)/man5
+ @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz
+ @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz
@if [ ! -d $(VIDEODIR) ]; then\
- mkdir $(VIDEODIR);\
- cp *.conf $(VIDEODIR);\
+ mkdir -p $(DESTDIR)$(VIDEODIR);\
+ cp *.conf $(DESTDIR)$(VIDEODIR);\
fi
# Source documentation:
diff -ru ./config.h ../vdr-1.2.6-new/config.h
--- ./config.h 2003-11-14 14:29:13.000000000 +0100
+++ ../vdr-1.2.6-new/config.h 2004-10-27 08:48:41.652515906 +0200
@@ -137,7 +137,7 @@
bool Save(void)
{
bool result = true;
- T *l = (T *)First();
+ T *l = (T *)cList<T>::First();
cSafeFile f(fileName);
if (f.Open()) {
while (l) {
diff -ru ./plugin.c ../vdr-1.2.6-new/plugin.c
--- ./plugin.c 2003-08-30 16:52:58.000000000 +0200
+++ ../vdr-1.2.6-new/plugin.c 2004-10-27 08:54:26.068755758 +0200
@@ -162,7 +162,7 @@
const char *error = dlerror();
if (!error) {
void *(*creator)(void);
- (void *)creator = dlsym(handle, "VDRPluginCreator");
+ creator = (void *(*)())dlsym(handle, "VDRPluginCreator");
if (!(error = dlerror()))
plugin = (cPlugin *)creator();
}
|
GitWeb
