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
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
|
diff -uNr supertuxkart-0.7.2_orig//configure.ac supertuxkart-0.7.2/configure.ac
--- supertuxkart-0.7.2_orig//configure.ac 2011-07-15 18:34:29.000000000 +0700
+++ supertuxkart-0.7.2/configure.ac 2011-07-28 19:34:43.192159546 +0700
@@ -106,7 +106,7 @@
LIBS=$save_LIBS
if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then
# if GLcore found, then also check for GL
- AC_SEARCH_LIBS(glXCreateContext, GL)
+ AC_SEARCH_LIBS(gluLookAt, GLU)
fi
;;
esac
@@ -244,7 +244,7 @@
# ---- Check these flags do work by building a small irrLicht sample
echo "checking for irrlicht libraries..."
save_LIBS=$LIBS
-LIBS="$LIBS $irrlicht_LIBS $opengl_LIBS"
+LIBS="$LIBS $irrlicht_LIBS $opengl_LIBS -lm -lz -lX11"
irrlicht_sample_built_fine="false"
@@ -402,7 +402,6 @@
enet_LIBS="-Lenet -lenet"
;;
esac
-ENETTREE="src/enet"
# ==========================================
# Check for a known compiler bug, details in
@@ -453,7 +452,6 @@
src/ide/Makefile \
src/bullet/Makefile \
src/bullet/src/Makefile \
- src/enet/Makefile \
])
AC_OUTPUT
echo -e $SUMMARY
diff -uNr supertuxkart-0.7.2_orig//data/challenges/Makefile.am supertuxkart-0.7.2/data/challenges/Makefile.am
--- supertuxkart-0.7.2_orig//data/challenges/Makefile.am 2011-06-14 06:08:42.000000000 +0700
+++ supertuxkart-0.7.2/data/challenges/Makefile.am 2011-07-28 19:35:53.701159576 +0700
@@ -1,5 +1,5 @@
# challenges/
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/challenges
+pkgdatadir = $(datadir)/$(PACKAGE)/data/challenges
nobase_dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.challenge")
diff -uNr supertuxkart-0.7.2_orig//data/fonts/Makefile.am supertuxkart-0.7.2/data/fonts/Makefile.am
--- supertuxkart-0.7.2_orig//data/fonts/Makefile.am 2011-06-14 06:08:26.000000000 +0700
+++ supertuxkart-0.7.2/data/fonts/Makefile.am 2011-07-28 19:34:43.192159546 +0700
@@ -1,6 +1,6 @@
# data/fonts/
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/fonts
+pkgdatadir = $(datadir)/$(PACKAGE)/data/fonts
dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.png") \
$(shell find $(srcdir) -name "*.xml")
diff -uNr supertuxkart-0.7.2_orig//data/gfx/Makefile.am supertuxkart-0.7.2/data/gfx/Makefile.am
--- supertuxkart-0.7.2_orig//data/gfx/Makefile.am 2011-06-14 06:08:40.000000000 +0700
+++ supertuxkart-0.7.2/data/gfx/Makefile.am 2011-07-28 19:35:43.488159570 +0700
@@ -1,5 +1,5 @@
#data/gfx
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/gfx
+pkgdatadir = $(datadir)/$(PACKAGE)/data/gfx
dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.xml")
diff -uNr supertuxkart-0.7.2_orig//data/grandprix/Makefile.am supertuxkart-0.7.2/data/grandprix/Makefile.am
--- supertuxkart-0.7.2_orig//data/grandprix/Makefile.am 2011-06-14 06:08:17.000000000 +0700
+++ supertuxkart-0.7.2/data/grandprix/Makefile.am 2011-07-28 19:34:43.193159546 +0700
@@ -1,6 +1,6 @@
# data/music
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/grandprix
+pkgdatadir = $(datadir)/$(PACKAGE)/data/grandprix
dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.grandprix") \
$(shell find $(srcdir) -name "*.challenge") \
diff -uNr supertuxkart-0.7.2_orig//data/gui/Makefile.am supertuxkart-0.7.2/data/gui/Makefile.am
--- supertuxkart-0.7.2_orig//data/gui/Makefile.am 2011-06-14 06:08:21.000000000 +0700
+++ supertuxkart-0.7.2/data/gui/Makefile.am 2011-07-28 19:34:43.193159546 +0700
@@ -1,6 +1,6 @@
# data/gui/
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/gui
+pkgdatadir = $(datadir)/$(PACKAGE)/data/gui
nobase_dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.png" ) \
$(shell find $(srcdir) -name "*.jpg" ) \
diff -uNr supertuxkart-0.7.2_orig//data/karts/Makefile.am supertuxkart-0.7.2/data/karts/Makefile.am
--- supertuxkart-0.7.2_orig//data/karts/Makefile.am 2011-06-14 06:08:11.000000000 +0700
+++ supertuxkart-0.7.2/data/karts/Makefile.am 2011-07-28 19:34:43.193159546 +0700
@@ -1,6 +1,6 @@
# data/karts
-pkgdatadir= $(datadir)/games/$(PACKAGE)/data/karts
+pkgdatadir= $(datadir)/$(PACKAGE)/data/karts
nobase_dist_pkgdata_DATA = $(shell find $(srcdir) -name "materials.xml") \
$(shell find $(srcdir) -name "*.png") \
diff -uNr supertuxkart-0.7.2_orig//data/Makefile.am supertuxkart-0.7.2/data/Makefile.am
--- supertuxkart-0.7.2_orig//data/Makefile.am 2011-06-14 06:08:25.000000000 +0700
+++ supertuxkart-0.7.2/data/Makefile.am 2011-07-28 19:34:43.193159546 +0700
@@ -1,7 +1,7 @@
# data/
SUBDIRS = challenges fonts gfx gui karts models music po sfx textures tracks grandprix
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data
+pkgdatadir = $(datadir)/$(PACKAGE)/data
dist_pkgdata_DATA = \
$(shell find $(srcdir) -name "*.data") \
@@ -13,16 +13,3 @@
stk_config.xml powerup.xml items.xml \
CREDITS
-desktopdir = $(prefix)/share/applications
-desktop_DATA = supertuxkart.desktop
-
-icondir = $(prefix)/share/pixmaps
-dist_icon_DATA = supertuxkart_32.xpm supertuxkart_64.xpm
-
-
-# The desktop file needs the absolute path to the binary
-# since e.g. /usr/games might not be in the standard path
-EXTRA_DIST = supertuxkart_desktop.template
-CLEANFILES = supertuxkart.desktop
-supertuxkart.desktop: Makefile supertuxkart_desktop.template
- sed 's#PREFIX#$(prefix)#' $(srcdir)/supertuxkart_desktop.template >supertuxkart.desktop
diff -uNr supertuxkart-0.7.2_orig//data/models/Makefile.am supertuxkart-0.7.2/data/models/Makefile.am
--- supertuxkart-0.7.2_orig//data/models/Makefile.am 2011-06-14 06:08:25.000000000 +0700
+++ supertuxkart-0.7.2/data/models/Makefile.am 2011-07-28 19:34:43.194159546 +0700
@@ -1,6 +1,6 @@
# data/models/
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/models
+pkgdatadir = $(datadir)/$(PACKAGE)/data/models
dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.b3d") \
$(shell find $(srcdir) -name "*.png") \
diff -uNr supertuxkart-0.7.2_orig//data/music/Makefile.am supertuxkart-0.7.2/data/music/Makefile.am
--- supertuxkart-0.7.2_orig//data/music/Makefile.am 2011-06-14 06:08:29.000000000 +0700
+++ supertuxkart-0.7.2/data/music/Makefile.am 2011-07-28 19:34:43.194159546 +0700
@@ -1,6 +1,6 @@
# data/music
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/music
+pkgdatadir = $(datadir)/$(PACKAGE)/data/music
dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.ogg") \
$(shell find $(srcdir) -name "*.music") \
diff -uNr supertuxkart-0.7.2_orig//data/po/Makefile.am supertuxkart-0.7.2/data/po/Makefile.am
--- supertuxkart-0.7.2_orig//data/po/Makefile.am 2011-06-14 06:07:23.000000000 +0700
+++ supertuxkart-0.7.2/data/po/Makefile.am 2011-07-28 19:34:43.194159546 +0700
@@ -1,6 +1,6 @@
# data/po/
-pkgdatadir = $(datadir)/games/@PACKAGE@/data/po
+pkgdatadir = $(datadir)/@PACKAGE@/data/po
dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.po") \
supertuxkart.pot
diff -uNr supertuxkart-0.7.2_orig//data/sfx/Makefile.am supertuxkart-0.7.2/data/sfx/Makefile.am
--- supertuxkart-0.7.2_orig//data/sfx/Makefile.am 2011-06-14 06:08:23.000000000 +0700
+++ supertuxkart-0.7.2/data/sfx/Makefile.am 2011-07-28 19:34:43.194159546 +0700
@@ -1,6 +1,6 @@
# sfx/
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/sfx
+pkgdatadir = $(datadir)/$(PACKAGE)/data/sfx
nobase_dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.ogg") \
$(shell find $(srcdir) -name "sfx.xml") \
diff -uNr supertuxkart-0.7.2_orig//data/textures/Makefile.am supertuxkart-0.7.2/data/textures/Makefile.am
--- supertuxkart-0.7.2_orig//data/textures/Makefile.am 2011-06-14 06:08:39.000000000 +0700
+++ supertuxkart-0.7.2/data/textures/Makefile.am 2011-07-28 19:34:43.195159546 +0700
@@ -1,6 +1,6 @@
# data/textures
-pkgdatadir = $(datadir)/games/$(PACKAGE)/data/textures
+pkgdatadir = $(datadir)/$(PACKAGE)/data/textures
dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.png") \
$(shell find $(srcdir) -name "*.jpg") \
materials.xml License.txt
diff -uNr supertuxkart-0.7.2_orig//data/tracks/Makefile.am supertuxkart-0.7.2/data/tracks/Makefile.am
--- supertuxkart-0.7.2_orig//data/tracks/Makefile.am 2011-06-14 06:07:50.000000000 +0700
+++ supertuxkart-0.7.2/data/tracks/Makefile.am 2011-07-28 19:34:43.195159546 +0700
@@ -1,6 +1,6 @@
# data/tracks
-pkgdatadir= $(datadir)/games/$(PACKAGE)/data/tracks
+pkgdatadir= $(datadir)/$(PACKAGE)/data/tracks
nobase_dist_pkgdata_DATA = $(shell find $(srcdir) -name "*.jpg") \
$(shell find $(srcdir) -name "*.JPG") \
$(shell find $(srcdir) -name "*.png") \
diff -uNr supertuxkart-0.7.2_orig//Makefile.am supertuxkart-0.7.2/Makefile.am
--- supertuxkart-0.7.2_orig//Makefile.am 2011-06-14 06:07:14.000000000 +0700
+++ supertuxkart-0.7.2/Makefile.am 2011-07-28 19:34:43.195159546 +0700
@@ -1,8 +1,6 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = $(BULLETTREE) $(ENETTREE) src doc data
+SUBDIRS = $(BULLETTREE) $(ENETTREE) src data
-pkgdatadir=$(datadir)/doc/$(PACKAGE)
-dist_pkgdata_DATA=AUTHORS ChangeLog COPYING README
# NEWS only contains "see changelog"
# CHANGES only contains "see NEW"
diff -uNr supertuxkart-0.7.2_orig//src/Makefile.am supertuxkart-0.7.2/src/Makefile.am
--- supertuxkart-0.7.2_orig//src/Makefile.am 2011-06-14 06:09:33.000000000 +0700
+++ supertuxkart-0.7.2/src/Makefile.am 2011-07-28 19:34:43.196159546 +0700
@@ -2,10 +2,9 @@
SUBDIRS = ide
-bindir=$(prefix)/games
bin_PROGRAMS = supertuxkart
-AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\"" \
+AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/$(PACKAGE)/\"" \
-I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/
supertuxkart_SOURCES = \
|
GitWeb