]>
Commit | Line | Data |
---|---|---|
af654522 JB |
1 | --- main/doc/man/macros/mkhead.awk.orig 2008-02-16 23:46:15.790902000 +0100 |
2 | +++ main/doc/man/macros/mkhead.awk 2008-02-17 00:02:59.748114883 +0100 | |
3 | @@ -6,6 +6,7 @@ | |
4 | # GL (glu, glx) function, then generates M4 definitions for man page | |
5 | # | |
6 | BEGIN { | |
7 | + FS = " |\t|\\(" | |
8 | found = 0 | |
9 | numargs = 0 | |
10 | newargs[0] = "" | |
11 | @@ -22,12 +23,14 @@ BEGIN { | |
12 | } | |
13 | } | |
14 | ||
15 | -/extern/ { | |
16 | +/extern|GLAPI/ { | |
17 | cmdfield = 0; | |
18 | # search for the command string | |
19 | for (i = 3; i <= NF; i++) | |
20 | { | |
21 | name = $i; | |
22 | + if (substr(name, 1, 1) == "*") | |
23 | + name = substr(name, 2); | |
24 | if (index(name,"gl") == 1) | |
25 | { | |
26 | cmdfield = i; | |
27 | --- main/doc/man/macros/mkhead.ftn.awk.orig 2000-01-26 11:30:36.000000000 +0100 | |
28 | +++ main/doc/man/macros/mkhead.ftn.awk 2008-02-17 00:02:16.821668644 +0100 | |
29 | @@ -30,12 +30,14 @@ BEGIN { | |
30 | } | |
31 | } | |
32 | ||
33 | -/extern/ { | |
34 | +/extern|GLAPI/ { | |
35 | cmdfield = 0; | |
36 | # search for the command string | |
37 | for (i = 3; i <= NF; i++) | |
38 | { | |
39 | name = $i; | |
40 | + if (substr(name, 1, 1) == "*") | |
41 | + name = substr(name, 2); | |
42 | if (index(name,"gl") == 1) | |
43 | { | |
44 | cmdfield = i; | |
45 | @@ -40,7 +40,8 @@ BEGIN { | |
46 | { | |
47 | cmdfield = i; | |
48 | # strip the gl, glu, or glX prefix | |
49 | - if (index(name,"glu") == 1 || index(name,"glX") == 1) | |
50 | + # note that the X of glX is not stripped! | |
51 | + if (index(name,"glu") == 1) | |
52 | name = substr(name,4); | |
53 | else | |
54 | name = substr(name,3); | |
55 | @@ -78,10 +79,10 @@ BEGIN { | |
56 | ||
57 | END { | |
58 | if (found == 0) { | |
59 | - if (basename == "glxintro") { | |
60 | + if (basename == "xintro") { | |
61 | numNames = 1; | |
62 | numFound[0] = 1; | |
63 | - names[0,0] = "Intro"; | |
64 | + names[0,0] = "XIntro"; | |
65 | } | |
66 | else if (basename == "intro") { | |
67 | numNames = 1; | |
68 | @@ -101,7 +102,7 @@ END { | |
69 | printf "_define(_header,@<dnl\n" | |
70 | printf "_setup()dnl\n" | |
71 | printf "_define(_cname,$1)dnl\n" | |
72 | - printf ".TH %s$1 \n", prefix | |
73 | + printf ".TH %s$1 3G\n", prefix | |
74 | printf ".SH NAME\n" | |
75 | printf ".B \"" | |
76 | for (i=0; i<numNames; i++) | |
77 | --- main/doc/man/manglx/standard/GNUmakefile.orig 2000-04-05 08:43:38.000000000 +0200 | |
78 | +++ main/doc/man/manglx/standard/GNUmakefile 2008-02-17 01:24:04.165322221 +0100 | |
79 | @@ -55,7 +55,7 @@ | |
80 | MANPREF = man | |
81 | include $(DEPTH)/mandefs | |
82 | ||
83 | -APIFILE = $(ROOT)/usr/include/GL/glx.h | |
84 | +APIFILE = "$(ROOT)/usr/include/GL/glx.h $(ROOT)/usr/include/GL/glxext.h" | |
85 | ||
86 | VERSION = Version 1.2 | |
87 | DATE = 6 March 1997 |