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
7 */*) cd `expr X$0 : 'X\(.*\)/'` ;;
10 + # In case Configure is not patched:
11 + : ${obj_ext=.o} ${obj_ext_regexp='\.o'} ${lib_ext=.a} ${ar=ar} ${firstmakefile=makefile}
13 echo "Extracting x2p/Makefile (with variable substitutions)"
15 cat >Makefile <<!GROK!THIS!
19 mallocobj = $mallocobj
20 shellflags = $shellflags
22 + firstmakefile = $firstmakefile
26 + O_REGEXP = $obj_ext_regexp
34 cat >>Makefile <<'!NO!SUBS!'
38 c = hash.c $(mallocsrc) str.c util.c walk.c
40 ! obj = hash.o $(mallocobj) str.o util.o walk.o
50 all: $(public) $(private) $(util)
54 ! $(CC) $(LDFLAGS) $(obj) a2p.o $(libs) -o a2p
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
60 c = hash.c $(mallocsrc) str.c util.c walk.c
62 ! obj = hash$(O) $(mallocobj) str$(O) util$(O) walk$(O)
72 all: $(public) $(private) $(util)
76 ! $(CC) $(LDFLAGS) $(obj) a2p$(O) $(libs) -o a2p
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
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
92 rm -f *.orig core $(addedbyconf) all malloc.c
93 ! rm -f makefile makefile.old
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.
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
108 rm -f *.orig core $(addedbyconf) all malloc.c
109 ! rm -f $(firstmakefile) makefile.old
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.
115 lint $(lintflags) $(defs) $(c) > a2p.fuzz
117 depend: $(mallocsrc) ../makedepend
121 echo $(c) | tr ' ' '\012' >.clist
123 lint $(lintflags) $(defs) $(c) > a2p.fuzz
125 depend: $(mallocsrc) ../makedepend
129 echo $(c) | tr ' ' '\012' >.clist
135 ! ln Makefile ../Makefile
143 ! $ln Makefile ../Makefile
146 ! rm -f $firstmakefile
147 *** installman.orig Thu Jun 22 10:42:40 1995
148 --- installman Thu Nov 02 04:07:38 1995
155 + $ENV{SHELL} = 'sh' if $Config{osname} eq 'os2';
158 $release = substr($ver,0,3); # Not used presently.
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";
171 # Install the main pod pages.
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";
184 # Install the main pod pages.
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";
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
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";
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
204 # Convert name from File/Basename.pm to File::Basename.3 format,
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");
212 # Convert name from File/Basename.pm to File::Basename.3 format,
214 $manpage =~ s#\.p(m|od)$##;
215 ! if ($Config{osname} eq "os2") {
216 ! $manpage =~ s#/#.#g;
218 ! $manpage =~ s#/#::#g;
220 $manpage = "${mandir}/${manpage}.${manext}";
221 # Print $release $patchlevel stuff? or should pod2man do that?
222 &cmd("$pod2man $mod > $manpage");