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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
|
diff -ru olsrd-0.4.10~/gui/linux-gtk/Makefile olsrd-0.4.10/gui/linux-gtk/Makefile
--- olsrd-0.4.10~/gui/linux-gtk/Makefile 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/gui/linux-gtk/Makefile 2006-11-01 17:51:27.000000000 +0100
@@ -1,7 +1,7 @@
-CC= gcc
+CC?= gcc
#CC= arm-linux-gcc
-CFLAGS= -Wall `pkg-config --cflags gtk+-2.0` #-g #to use GDB
+CFLAGS+= -Wall `pkg-config --cflags gtk+-2.0` #-g #to use GDB
LFLAGS= `pkg-config --libs gtk+-2.0`
SRCS= src/main.c src/interface.c src/callbacks.c src/ipc.c \
@@ -23,4 +23,5 @@
rm -f $(OBJS)
install:
- cp ./olsrd-gui /usr/bin/
+ mkdir -p ${DESTDIR}/usr/bin
+ cp ./olsrd-gui ${DESTDIR}/usr/bin/
diff -ru olsrd-0.4.10~/make/Makefile.fbsd olsrd-0.4.10/make/Makefile.fbsd
--- olsrd-0.4.10~/make/Makefile.fbsd 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/make/Makefile.fbsd 2006-11-01 17:51:05.000000000 +0100
@@ -2,12 +2,12 @@
# FREEBSD SPECIFIC CONFIGURATION
#
-INSTALL_PREFIX ?= /usr/local
-SBINDIR = $(INSTALL_PREFIX)/sbin
-ETCDIR = $(INSTALL_PREFIX)/etc
-LIBDIR = $(INSTALL_PREFIX)/lib
-DOCDIR = $(INSTALL_PREFIX)/share/doc
-MANDIR = $(INSTALL_PREFIX)/man
+DESTDIR ?= /usr/local
+SBINDIR = $(DESTDIR)/sbin
+ETCDIR = $(DESTDIR)/etc
+LIBDIR = $(DESTDIR)/lib
+DOCDIR = $(DESTDIR)/share/doc
+MANDIR = $(DESTDIR)/man
SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
@@ -22,8 +22,8 @@
ifdef LIBNET
-CFLAGS += -DSPOOF -I$(INSTALL_PREFIX)/include
-LIBS += -L$(INSTALL_PREFIX)/lib -lnet
+CFLAGS += -DSPOOF -I$(DESTDIR)/include
+LIBS += -L$(DESTDIR)/lib -lnet
endif
diff -ru olsrd-0.4.10~/make/Makefile.linux olsrd-0.4.10/make/Makefile.linux
--- olsrd-0.4.10~/make/Makefile.linux 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/make/Makefile.linux 2006-11-01 17:51:05.000000000 +0100
@@ -2,8 +2,8 @@
# LINUX SPECIFIC CONFIGURATION
#
-INSTALL_PREFIX ?=
-LIBDIR = $(INSTALL_PREFIX)/usr/lib
+DESTDIR ?=
+LIBDIR = $(DESTDIR)/usr/lib
SRCS += $(wildcard src/linux/*.c) $(wildcard src/unix/*.c)
HDRS += $(wildcard src/linux/*.h) $(wildcard src/unix/*.h)
diff -ru olsrd-0.4.10~/make/Makefile.nbsd olsrd-0.4.10/make/Makefile.nbsd
--- olsrd-0.4.10~/make/Makefile.nbsd 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/make/Makefile.nbsd 2006-11-01 17:51:05.000000000 +0100
@@ -2,8 +2,8 @@
# NETBSD SPECIFIC CONFIGURATION
#
-INSTALL_PREFIX ?=
-LIBDIR = $(INSTALL_PREFIX)/usr/lib
+DESTDIR ?=
+LIBDIR = $(DESTDIR)/usr/lib
SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
diff -ru olsrd-0.4.10~/make/Makefile.obsd olsrd-0.4.10/make/Makefile.obsd
--- olsrd-0.4.10~/make/Makefile.obsd 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/make/Makefile.obsd 2006-11-01 17:51:05.000000000 +0100
@@ -2,8 +2,8 @@
# OPENBSD SPECIFIC CONFIGURATION
#
-INSTALL_PREFIX ?=
-LIBDIR = $(INSTALL_PREFIX)/usr/lib
+DESTDIR ?=
+LIBDIR = $(DESTDIR)/usr/lib
SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
diff -ru olsrd-0.4.10~/make/Makefile.osx olsrd-0.4.10/make/Makefile.osx
--- olsrd-0.4.10~/make/Makefile.osx 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/make/Makefile.osx 2006-11-01 17:51:05.000000000 +0100
@@ -2,8 +2,8 @@
# MAC OSX SPECIFIC CONFIGURATION
#
-INSTALL_PREFIX ?=
-LIBDIR = $(INSTALL_PREFIX)/usr/lib
+DESTDIR ?=
+LIBDIR = $(DESTDIR)/usr/lib
SRCS += $(wildcard src/bsd/*.c) $(wildcard src/unix/*.c)
HDRS += $(wildcard src/bsd/*.h) $(wildcard src/unix/*.h)
diff -ru olsrd-0.4.10~/make/Makefile.win32 olsrd-0.4.10/make/Makefile.win32
--- olsrd-0.4.10~/make/Makefile.win32 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/make/Makefile.win32 2006-11-01 17:51:05.000000000 +0100
@@ -2,7 +2,7 @@
# WINDOWS32 SPECIFIC CONFIGURATION
#
-INSTALL_PREFIX ?=
+DESTDIR ?=
EXENAME = olsrd.exe
SRCS += $(wildcard src/win32/*.c)
diff -ru olsrd-0.4.10~/make/Makefile.wince olsrd-0.4.10/make/Makefile.wince
--- olsrd-0.4.10~/make/Makefile.wince 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/make/Makefile.wince 2006-11-01 17:51:05.000000000 +0100
@@ -2,8 +2,8 @@
# WINDOWS CE SPECIFIC CONFIGURATION
#
-INSTALL_PREFIX ?=
-LIBDIR = $(INSTALL_PREFIX)/usr/lib
+DESTDIR ?=
+LIBDIR = $(DESTDIR)/usr/lib
SRCS += $(wildcard src/win32/*.c)
HDRS += $(wildcard src/win32/*.h)
diff -ru olsrd-0.4.10~/Makefile.inc olsrd-0.4.10/Makefile.inc
--- olsrd-0.4.10~/Makefile.inc 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/Makefile.inc 2006-11-01 18:02:31.000000000 +0100
@@ -1,17 +1,17 @@
# programs
CC ?= gcc
-STRIP ?= strip
+STRIP ?= true
BISON ?= bison
FLEX ?= flex
TAGCMD ?= etags
# target directories and names
-#INSTALL_PREFIX =
-SBINDIR = $(INSTALL_PREFIX)/usr/sbin
-ETCDIR = $(INSTALL_PREFIX)/etc
-LIBDIR = $(INSTALL_PREFIX)/usr/lib
-DOCDIR = $(INSTALL_PREFIX)/usr/share/doc
-MANDIR = $(INSTALL_PREFIX)/usr/share/man
+# DESTDIR =
+SBINDIR = $(DESTDIR)/usr/sbin
+ETCDIR = $(DESTDIR)/etc
+LIBDIR = $(DESTDIR)/usr/lib
+DOCDIR = $(DESTDIR)/usr/share/doc
+MANDIR = $(DESTDIR)/usr/share/man
CFGFILE = $(ETCDIR)/olsrd.conf
EXENAME = olsrd
diff -ru olsrd-0.4.10~/src/cfgparser/Makefile olsrd-0.4.10/src/cfgparser/Makefile
--- olsrd-0.4.10~/src/cfgparser/Makefile 2006-11-01 17:50:34.000000000 +0100
+++ olsrd-0.4.10/src/cfgparser/Makefile 2006-11-01 18:17:04.000000000 +0100
@@ -74,7 +74,7 @@
LDFLAGS += -shared -Wl,-soname,$(LIBNAME)
endif
-CFLAGS += -DMAKELIB
+CFLAGS += -DMAKELIB -fPIC
NAME = $(LIBNAME)
endif
|
GitWeb