Commit | Line | Data |
---|---|---|
ec8164d2 VM |
1 | diff -purN 0verkill-0.16.orig/0verkill.sh.in 0verkill-0.16/0verkill.sh.in |
2 | --- 0verkill-0.16.orig/0verkill.sh.in 1970-01-01 01:00:00.000000000 +0100 | |
3 | +++ 0verkill-0.16/0verkill.sh.in 2009-08-12 19:31:20.435907796 +0200 | |
4 | @@ -0,0 +1,21 @@ | |
5 | +#!/bin/bash | |
6 | + | |
7 | +APPNAME=$(basename $0) | |
8 | +DATAROOTDIR=@DATAROOTDIR@ | |
9 | + | |
10 | +cd $DATAROOTDIR | |
11 | +if [ $# -lt 1 ]; then | |
12 | + case $APPNAME in | |
13 | + 0verkill) ./0verkill ;; | |
14 | + x0verkill) ./x0verkill ;; | |
15 | + *) exit 0 ;; | |
16 | + esac | |
17 | +else | |
18 | + case $1 in | |
19 | + server|editor|xeditor|avi|bot) ./$@ ;; | |
20 | + *) exit 0 ;; | |
21 | + esac | |
22 | +fi | |
23 | + | |
24 | +# End of file | |
25 | + | |
26 | diff -purN 0verkill-0.16.orig/Makefile.in 0verkill-0.16/Makefile.in | |
27 | --- 0verkill-0.16.orig/Makefile.in 2009-08-12 18:52:41.713637542 +0200 | |
28 | +++ 0verkill-0.16/Makefile.in 2009-08-12 19:44:17.891020901 +0200 | |
29 | @@ -1,4 +1,10 @@ | |
30 | -CFLAGS=@CFLAGS@ -O3 @X_CFLAGS@ -Wall -W -Wstrict-prototypes -Wno-parentheses -fomit-frame-pointer | |
31 | +DESTDIR= | |
32 | + | |
33 | +BINDIR=/usr/bin | |
34 | +DATAROOTDIR=/usr/share/0verkill | |
35 | + | |
36 | + | |
37 | +CFLAGS=@CFLAGS@ -O2 @X_CFLAGS@ -Wall -W -Wstrict-prototypes -Wno-parentheses -fomit-frame-pointer | |
38 | #-malign-functions=0 | |
39 | LDFLAGS=@LDFLAGS@ | |
40 | LIBS=@LIBS@ | |
41 | @@ -6,10 +12,24 @@ XLIBS=@X_LIBS@ | |
42 | CC=@CC@ | |
43 | ||
44 | ||
45 | -all: server 0verkill @X0VERKILL@ @XEDITOR@ editor test_server avi bot @XAVI@ | |
46 | +BINARIES=server 0verkill @X0VERKILL@ @XEDITOR@ editor test_server avi bot @XAVI@ | |
47 | + | |
48 | +all: $(BINARIES) 0verkill.sh | |
49 | + | |
50 | +install: | |
51 | + @install -d -m 0755 $(DESTDIR)/{$(BINDIR),$(DATAROOTDIR)/{doc,grx,data}} | |
52 | + @install -m 0755 $(BINARIES) $(DESTDIR)/$(DATAROOTDIR) | |
53 | + @install -m 0755 0verkill.sh $(DESTDIR)/$(BINDIR)/0verkill | |
54 | + @if [ -f "x0verkill" ]; then ln -s 0verkill $(DESTDIR)/$(BINDIR)/x0verkill; fi | |
55 | + @install -m 0644 doc/*.txt $(DESTDIR)/$(DATAROOTDIR)/doc | |
56 | + @install -m 0644 grx/* $(DESTDIR)/$(DATAROOTDIR)/grx | |
57 | + @install -m 0644 data/* $(DESTDIR)/$(DATAROOTDIR)/data | |
58 | ||
59 | clean: | |
60 | - rm -f *.o server 0verkill editor test_server x0verkill xeditor avi xavi bot core | |
61 | + @rm -f *.o $(BINARIES) | |
62 | + | |
63 | +0verkill.sh: 0verkill.sh.in | |
64 | + @sed "s|@DATAROOTDIR@|$(DATAROOTDIR)|" 0verkill.sh.in > 0verkill.sh | |
65 | ||
66 | bot.o: bot.c config.h sprite.h data.h cfg.h net.h hash.h time.h math.h getopt.h error.h | |
67 | avi.o: avi.c console.h blit.h time.h help.h error.h | |
68 | diff -purN 0verkill-0.16.orig/configure.in 0verkill-0.16/configure.in | |
69 | --- 0verkill-0.16.orig/configure.in 2009-08-12 18:52:41.705635942 +0200 | |
70 | +++ 0verkill-0.16/configure.in 2009-08-12 18:59:50.982326078 +0200 | |
71 | @@ -72,8 +72,8 @@ fi | |
72 | ||
73 | if test "$with_x" = yes ; then | |
74 | if test "$ac_cv_have_emx" = yes && test -n "$X11ROOT"; then | |
75 | - CFLAGS="$CFLAGS -I$X11ROOT/XFree86/include" | |
76 | - LDFLAGS="$LDFLAGS -L$X11ROOT/XFree86/lib" | |
77 | + CFLAGS="$CFLAGS -I/usr/include/X11" | |
78 | + LDFLAGS="$LDFLAGS -L/usr/lib/X11" | |
79 | fi | |
80 | AC_PATH_XTRA | |
81 | dnl Replace `main' with a function in -lX11: |