Commit | Line | Data |
4633a7c4 |
1 | diff -cr ..\perl5os2.patch\perl5.001m.andy/x2p/Makefile.SH ./x2p/Makefile.SH |
2 | *** ../perl5os2.patch/perl5.001m.andy/x2p/Makefile.SH Fri May 26 07:33:48 1995 |
3 | --- ./x2p/Makefile.SH Thu Sep 28 00:00:42 1995 |
4 | *************** |
5 | *** 17,22 **** |
6 | --- 17,25 ---- |
7 | */*) cd `expr X$0 : 'X\(.*\)/'` ;; |
8 | esac |
9 | |
10 | + # In case Configure is not patched: |
11 | + : ${obj_ext=.o} ${obj_ext_regexp='\.o'} ${lib_ext=.a} ${ar=ar} ${firstmakefile=makefile} |
12 | + |
13 | echo "Extracting x2p/Makefile (with variable substitutions)" |
14 | rm -f Makefile |
15 | cat >Makefile <<!GROK!THIS! |
16 | *************** |
17 | *** 33,39 **** |
18 | --- 36,51 ---- |
19 | mallocobj = $mallocobj |
20 | shellflags = $shellflags |
21 | |
22 | + firstmakefile = $firstmakefile |
23 | + |
24 | libs = $libs |
25 | + O = $obj_ext |
26 | + O_REGEXP = $obj_ext_regexp |
27 | + A = $lib_ext |
28 | + AR = $ar |
29 | + |
30 | + .SUFFIXES: .c \$(O) |
31 | + |
32 | !GROK!THIS! |
33 | |
34 | cat >>Makefile <<'!NO!SUBS!' |
35 | *************** |
36 | *** 56,76 **** |
37 | |
38 | c = hash.c $(mallocsrc) str.c util.c walk.c |
39 | |
40 | ! obj = hash.o $(mallocobj) str.o util.o walk.o |
41 | |
42 | lintflags = -phbvxac |
43 | |
44 | # grrr |
45 | SHELL = /bin/sh |
46 | |
47 | ! .c.o: |
48 | $(CCCMD) $*.c |
49 | |
50 | all: $(public) $(private) $(util) |
51 | touch all |
52 | |
53 | ! a2p: $(obj) a2p.o |
54 | ! $(CC) $(LDFLAGS) $(obj) a2p.o $(libs) -o a2p |
55 | |
56 | # I now supply a2p.c with the kits, so the following section is |
57 | # used only if you force byacc to run by saying |
58 | --- 67,87 ---- |
59 | |
60 | c = hash.c $(mallocsrc) str.c util.c walk.c |
61 | |
62 | ! obj = hash$(O) $(mallocobj) str$(O) util$(O) walk$(O) |
63 | |
64 | lintflags = -phbvxac |
65 | |
66 | # grrr |
67 | SHELL = /bin/sh |
68 | |
69 | ! .c$(O): |
70 | $(CCCMD) $*.c |
71 | |
72 | all: $(public) $(private) $(util) |
73 | touch all |
74 | |
75 | ! a2p: $(obj) a2p$(O) |
76 | ! $(CC) $(LDFLAGS) $(obj) a2p$(O) $(libs) -o a2p |
77 | |
78 | # I now supply a2p.c with the kits, so the following section is |
79 | # used only if you force byacc to run by saying |
80 | *************** |
81 | *** 86,100 **** |
82 | a2p.c: a2p.y |
83 | -@touch a2p.c |
84 | |
85 | ! a2p.o: a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h handy.h ../config.h str.h hash.h |
86 | $(CCCMD) $(LARGE) a2p.c |
87 | |
88 | clean: |
89 | ! rm -f a2p *.o |
90 | |
91 | realclean: clean |
92 | rm -f *.orig core $(addedbyconf) all malloc.c |
93 | ! rm -f makefile makefile.old |
94 | |
95 | # The following lint has practically everything turned on. Unfortunately, |
96 | # you have to wade through a lot of mumbo jumbo that can't be suppressed. |
97 | --- 97,111 ---- |
98 | a2p.c: a2p.y |
99 | -@touch a2p.c |
100 | |
101 | ! a2p$(O): a2p.c a2py.c a2p.h EXTERN.h util.h INTERN.h handy.h ../config.h str.h hash.h |
102 | $(CCCMD) $(LARGE) a2p.c |
103 | |
104 | clean: |
105 | ! rm -f a2p *$(O) |
106 | |
107 | realclean: clean |
108 | rm -f *.orig core $(addedbyconf) all malloc.c |
109 | ! rm -f $(firstmakefile) makefile.old |
110 | |
111 | # The following lint has practically everything turned on. Unfortunately, |
112 | # you have to wade through a lot of mumbo jumbo that can't be suppressed. |
113 | *************** |
114 | *** 105,111 **** |
115 | lint $(lintflags) $(defs) $(c) > a2p.fuzz |
116 | |
117 | depend: $(mallocsrc) ../makedepend |
118 | ! ../makedepend |
119 | |
120 | clist: |
121 | echo $(c) | tr ' ' '\012' >.clist |
122 | --- 116,122 ---- |
123 | lint $(lintflags) $(defs) $(c) > a2p.fuzz |
124 | |
125 | depend: $(mallocsrc) ../makedepend |
126 | ! sh ../makedepend |
127 | |
128 | clist: |
129 | echo $(c) | tr ' ' '\012' >.clist |
130 | *************** |
131 | *** 131,137 **** |
132 | case `pwd` in |
133 | *SH) |
134 | $rm -f ../Makefile |
135 | ! ln Makefile ../Makefile |
136 | ;; |
137 | esac |
138 | ! rm -f makefile |
139 | --- 142,148 ---- |
140 | case `pwd` in |
141 | *SH) |
142 | $rm -f ../Makefile |
143 | ! $ln Makefile ../Makefile |
144 | ;; |
145 | esac |
146 | ! rm -f $firstmakefile |
147 | *** installman.orig Thu Jun 22 10:42:40 1995 |
148 | --- installman Thu Nov 02 04:07:38 1995 |
149 | *************** |
150 | *** 6,11 **** |
151 | --- 6,12 ---- |
152 | require Cwd; |
153 | |
154 | umask 022; |
155 | + $ENV{SHELL} = 'sh' if $Config{osname} eq 'os2'; |
156 | |
157 | $ver = $]; |
158 | $release = substr($ver,0,3); # Not used presently. |
159 | *************** |
160 | *** 38,48 **** |
161 | |
162 | #Sanity checks |
163 | |
164 | ! -x "./perl" || warn "./perl not found! Have you run make?\n"; |
165 | -d $Config{'installprivlib'} |
166 | || warn "Perl library directory $Config{'installprivlib'} not found. |
167 | Have you run make install?. (Installing anyway.)\n"; |
168 | ! -x 't/TEST' || warn "WARNING: You've never run 'make test'!!!", |
169 | " (Installing anyway.)\n"; |
170 | |
171 | # Install the main pod pages. |
172 | --- 39,50 ---- |
173 | |
174 | #Sanity checks |
175 | |
176 | ! -x "./perl$Config{exe_ext}" |
177 | ! or warn "./perl$Config{exe_ext} not found! Have you run make?\n"; |
178 | -d $Config{'installprivlib'} |
179 | || warn "Perl library directory $Config{'installprivlib'} not found. |
180 | Have you run make install?. (Installing anyway.)\n"; |
181 | ! -x "t/perl$Config{exe_ext}" || warn "WARNING: You've never run 'make test'!!!", |
182 | " (Installing anyway.)\n"; |
183 | |
184 | # Install the main pod pages. |
185 | *************** |
186 | *** 66,72 **** |
187 | # are enhancements or changes from previous installed versions. |
188 | # The error message doesn't include the '..' because the user |
189 | # won't be aware that we've chdir to $poddir. |
190 | ! -x "../pod/pod2man" || die "Executable pod/pod2man not found.\n"; |
191 | |
192 | # We want to be sure to use the current perl. We can't rely on |
193 | # the installed perl because it might not be actually installed |
194 | --- 68,74 ---- |
195 | # are enhancements or changes from previous installed versions. |
196 | # The error message doesn't include the '..' because the user |
197 | # won't be aware that we've chdir to $poddir. |
198 | ! -r "../pod/pod2man" || die "Executable pod/pod2man not found.\n"; |
199 | |
200 | # We want to be sure to use the current perl. We can't rely on |
201 | # the installed perl because it might not be actually installed |
202 | *************** |
203 | *** 86,92 **** |
204 | # Convert name from File/Basename.pm to File::Basename.3 format, |
205 | # if necessary. |
206 | $manpage =~ s#\.p(m|od)$##; |
207 | ! $manpage =~ s#/#::#g; |
208 | $manpage = "${mandir}/${manpage}.${manext}"; |
209 | # Print $release $patchlevel stuff? or should pod2man do that? |
210 | &cmd("$pod2man $mod > $manpage"); |
211 | --- 88,98 ---- |
212 | # Convert name from File/Basename.pm to File::Basename.3 format, |
213 | # if necessary. |
214 | $manpage =~ s#\.p(m|od)$##; |
215 | ! if ($Config{osname} eq "os2") { |
216 | ! $manpage =~ s#/#.#g; |
217 | ! } else { |
218 | ! $manpage =~ s#/#::#g; |
219 | ! } |
220 | $manpage = "${mandir}/${manpage}.${manext}"; |
221 | # Print $release $patchlevel stuff? or should pod2man do that? |
222 | &cmd("$pod2man $mod > $manpage"); |