]>
Commit | Line | Data |
---|---|---|
c4996e56 | 1 | --- xbl-1.0j/bl.c.orig Mon Aug 14 00:47:26 2000 |
2 | +++ xbl-1.0j/bl.c Mon Aug 14 00:48:24 2000 | |
3 | @@ -285,8 +285,10 @@ | |
4 | sprintf(buf,"%s/Xbl",RESOURCEDIR) ; | |
5 | getres( XrmGetFileDatabase(buf) , allargs ) ; | |
6 | ||
7 | +/* | |
8 | sprintf(buf,"%s/Xbl",SCOREDIR) ; | |
9 | getres( XrmGetFileDatabase(buf) , allargs ) ; | |
10 | +*/ | |
11 | ||
12 | /* I don't remember why these lines should be commented.... | |
13 | ||
14 | --- xbl-1.0j/buttons.c.orig Mon Aug 14 00:48:30 2000 | |
15 | +++ xbl-1.0j/buttons.c Mon Aug 14 00:52:04 2000 | |
16 | @@ -318,27 +318,7 @@ | |
17 | struct moving_button *b ; | |
18 | int but ; | |
19 | { | |
20 | -char buf[LINE_LENGTH] ; | |
21 | -FILE *f ; | |
22 | - | |
23 | XFlush(b->menu->bl->x.display) ; | |
24 | -sprintf(buf,"%s/COPYING",SCOREDIR) ; | |
25 | -f = fopen( buf,"r" ) ; | |
26 | - | |
27 | -if ( f==0 ) | |
28 | - { | |
29 | - fprintf(stderr,"Please install copyright file %s\n",buf) ; | |
30 | - return ; | |
31 | - } | |
32 | - | |
33 | -do | |
34 | - { | |
35 | - fgets(buf,LINE_LENGTH-1,f) ; | |
36 | - if ( feof(f) ) break ; | |
37 | - printf("%s",buf) ; | |
38 | - } | |
39 | -while(!feof(f)) ; | |
40 | -fclose(f) ; | |
41 | } | |
42 | /**************************************************************************/ | |
43 | /**************************************************************************/ | |
44 | --- xbl-1.0j/Makefile.in.config Thu Nov 12 22:57:13 1998 | |
45 | +++ xbl-1.0j/Makefile.in Mon Aug 14 01:06:38 2000 | |
46 | @@ -11,10 +11,10 @@ | |
47 | ||
48 | # If xbl must NOT run with SGID bit (for protect scores files) then | |
49 | # comment next line | |
50 | -USE_SETGID=-DUSE_SETGID | |
1e9c844c | 51 | +USE_SETGID=-DUSE_SETGID |
c4996e56 | 52 | |
53 | # group owner of games file | |
54 | -GROUP_GID=2 | |
55 | +GROUP_GID=20 | |
56 | ||
57 | ########################################################################### | |
58 | # You don't need to read below if you have xmkmf or imake | |
59 | @@ -22,34 +22,32 @@ | |
60 | ########################################################################### | |
61 | ||
62 | # Comment next line if you don't want to use "xmkmf" informations. | |
63 | -USE_XMKMF=YES | |
64 | +# USE_XMKMF=YES | |
65 | # Comment next line if you don't want to use "imake" informations. | |
66 | -IMAKE_OPTIONS=-DTOP=/ -DUseInstalled | |
67 | +# IMAKE_OPTIONS=-DTOP=/ -DUseInstalled | |
68 | + | |
69 | +DESTDIR= | |
70 | ||
71 | # Directory who contain X Resource Database | |
72 | # The default value if overrided by configure if xmkmf or imake exists. | |
73 | # | |
74 | -RESOURCEDIR=/usr/lib/X11/app-defaults | |
75 | -@XAPPLOADDIR@ | |
76 | +RESOURCEDIR=$(DESTDIR)/usr/X11R6/lib/X11/app-defaults | |
77 | ||
78 | # Directory where install binary | |
79 | # The default value if overrided by configure if xmkmf or imake exists. | |
80 | # | |
81 | -BINDIR=/usr/local/bin | |
82 | -@BINDIR@ | |
83 | +BINDIR=$(DESTDIR)/usr/X11R6/bin | |
84 | ||
85 | # Directory who contain score | |
86 | # Put your HOME if you have a private use of the game | |
87 | # The default value if overrided by configure if xmkmf or imake exists. | |
88 | # | |
89 | -SCOREDIR=/usr/local/lib/xbl | |
90 | -@SCOREDIR@ | |
1e9c844c | 91 | +SCOREDIR=$(DESTDIR)/var/games/xbl |
c4996e56 | 92 | |
93 | # Directory where put man pages. | |
94 | # The default value if overrided by configure if xmkmf or imake exists. | |
95 | # | |
96 | -MANPATH=/usr/local/man | |
97 | -@MANPATH@ | |
98 | +MANPATH=$(DESTDIR)/usr/X11R6/man | |
99 | ||
100 | ########################################################################### | |
101 | # Some values defined in imakefiles | |
102 | @@ -82,7 +80,7 @@ | |
103 | ||
104 | # For linking (configure script will modify this line) | |
105 | # xmkmf et imake informations are take into account. | |
106 | -LIBS = @LIBS@ -lm | |
107 | +LIBS = -L/usr/X11R6/lib -lXext -lX11 -lm | |
108 | ||
109 | all:demo | |
110 | ||
111 | @@ -93,7 +91,7 @@ | |
112 | -DRESOURCEDIR=\"$(RESOURCEDIR)\" \ | |
113 | -DXBLVERSION=\"$(XBLVERSION)\" \ | |
114 | -DGROUP_GID=$(GROUP_GID) \ | |
115 | - $(USE_SETGID) @DEFS@ -g | |
116 | + $(USE_SETGID) @DEFS@ $(RPM_OPT_FLAGS) | |
117 | # For link edit options | |
118 | LDOPTIONS=$(CFLAGS) | |
119 | LDOPTIONS=@LDOPTIONS@ | |
120 | @@ -123,28 +121,16 @@ | |
121 | @echo "Executable go in $(BINDIR)" | |
122 | @echo "Scores go in $(SCOREDIR)" | |
123 | @echo "Defaults go in $(RESOURCEDIR)/Xbl" | |
124 | - @echo "Man pages go in $(MANPATH)/mann or man1" | |
125 | + @echo "Man pages go in $(MANPATH)/man6" | |
126 | @-if [ "" != "$(USE_SETGID)" ] ; then \ | |
127 | echo "You use GID=$(GROUP_GID) protection" ; \ | |
128 | fi | |
129 | @echo "Type <Return> to continue installation" | |
130 | @echo "Type NO to stop installation" | |
131 | - @read LINE && test "" = "$$LINE" | |
132 | - # | |
133 | - # Remove old score file | |
134 | - # | |
135 | - @-if [ -d "$(SCOREDIR)" ] ; \ | |
136 | - then \ | |
137 | - echo "The scoring method and speeds of Xbl had change" ; \ | |
138 | - echo "If your version is older than 0.2e, destroy score." ; \ | |
139 | - echo "Type <Return> to destroy old score files" ; \ | |
140 | - echo "Type NO to hold old score files" ; \ | |
141 | - read LINE && test "" = "$$LINE" && rm $(SCOREDIR)/[1-9]* ; \ | |
142 | - exit 0 ; \ | |
143 | - fi | |
144 | # | |
145 | # Install executable | |
146 | # | |
147 | + -mkdir -p $(BINDIR) | |
148 | $(CP) bl $(BINDIR)/xbl | |
149 | -if [ "" = "$(USE_SETGID)" ] ; then \ | |
150 | chmod 755 $(BINDIR)/xbl ;\ | |
151 | @@ -157,9 +143,9 @@ | |
152 | # Install executable | |
153 | # | |
154 | -mkdir $(SCOREDIR) 2>/dev/null | |
155 | + -mkdir -p $(RESOURCEDIR) $(SCOREDIR) | |
156 | $(CP) Xbl.ad $(RESOURCEDIR)/Xbl ; chmod 644 $(RESOURCEDIR)/Xbl | |
157 | $(CP) Xbl.ad $(SCOREDIR)/Xbl ; chmod 644 $(SCOREDIR)/Xbl | |
158 | - $(CP) COPYING $(SCOREDIR) ; chmod 444 $(SCOREDIR)/COPYING | |
159 | -if [ "" = "$(USE_SETGID)" ] ; then \ | |
160 | chmod 777 $(SCOREDIR) ;\ | |
161 | chmod 666 $(SCOREDIR)/[1-9]* ;\ | |
162 | @@ -172,17 +158,15 @@ | |
163 | # | |
164 | # Install manual pages | |
165 | # | |
166 | - -if [ -d $(MANPATH)/mann ] ; \ | |
167 | + -mkdir -p $(MANPATH)/man6 | |
168 | + -if [ -d $(MANPATH)/man6 ] ; \ | |
169 | then \ | |
170 | - $(CP) xbl.man $(MANPATH)/mann/xbl.n ;\ | |
171 | - chmod 444 $(MANPATH)/mann/xbl.n ; \ | |
172 | + $(CP) xbl.man $(MANPATH)/man6/xbl.6x ;\ | |
173 | + chmod 444 $(MANPATH)/man6/xbl.6x ; \ | |
174 | else \ | |
175 | $(CP) xbl.man $(MANPATH)/man1/xbl.1 ;\ | |
176 | chmod 444 $(MANPATH)/man1/xbl.1 ; \ | |
177 | fi | |
178 | - cp *.gif *.html $(SCOREDIR) | |
179 | - # | |
180 | - -ls -lsa $(SCOREDIR) $(BINDIR)/xbl $(MANPATH)/man[1n]/xbl.[1n] | |
181 | @echo "Type xbl to play" | |
182 | ||
183 | bl:$(OBJ) |