dist-svn Mailing List for dist (Page 8)
Brought to you by:
rmanfredi
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(14) |
Sep
|
Oct
|
Nov
(2) |
Dec
(1) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
(7) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(17) |
Dec
(13) |
2011 |
Jan
(28) |
Feb
(3) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(1) |
Sep
|
Oct
|
Nov
(9) |
Dec
(4) |
2012 |
Jan
(7) |
Feb
(20) |
Mar
(7) |
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
(8) |
Dec
(3) |
2013 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(5) |
Jun
(1) |
Jul
|
Aug
(2) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
2014 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(4) |
Dec
(1) |
From: H.Merijn B. <h.m...@xs...> - 2008-05-28 09:28:45
|
On Wed, 28 May 2008 01:02:07 -0700, rma...@us... wrote: > Revision: 22 > http://dist.svn.sourceforge.net/dist/?rev=22&view=rev > Author: rmanfredi > Date: 2008-05-28 01:01:59 -0700 (Wed, 28 May 2008) did you miss this one? diff -pur dist-3.5-20/mcon/U/Filexp.U dist-3.5-23/mcon/U/Filexp.U --- dist-3.5-20/mcon/U/Filexp.U 2008-02-15 17:35:25.000000000 +0100 +++ dist-3.5-23/mcon/U/Filexp.U 2006-08-24 14:32:52.000000000 +0200 @@ -32,10 +32,10 @@ cat >filexp <<EOSS $startsh : expand filename case "\$1" in - \~/*|\~) + ~/*|~) echo \$1 | $sed "s|~|\${HOME-\$LOGDIR}|" ;; - \~*) + ~*) if $test -f /bin/csh; then /bin/csh -f -c "glob \$1" failed=\$? -- H.Merijn Brand Amsterdam Perl Mongers (http://amsterdam.pm.org/) using & porting perl 5.6.2, 5.8.x, 5.10.x on HP-UX 10.20, 11.00, 11.11, & 11.23, SuSE 10.1 & 10.2, AIX 5.2, and Cygwin. http://qa.perl.org http://mirrors.develooper.com/hpux/ http://www.test-smoke.org http://www.goldmark.org/jeff/stupid-disclaimers/ |
From: H.Merijn B. <h.m...@xs...> - 2008-05-28 09:04:45
|
On Wed, 28 May 2008 01:05:24 -0700, rma...@us... wrote: > Revision: 23 > http://dist.svn.sourceforge.net/dist/?rev=23&view=rev > Author: rmanfredi > Date: 2008-05-28 01:05:12 -0700 (Wed, 28 May 2008) > > Log Message: > ----------- > Removed last instance of $*, no longer supported in Perl 5.10. > > Modified Paths: > -------------- > trunk/dist/mcon/pl/files.pl > > Modified: trunk/dist/mcon/pl/files.pl > =================================================================== > --- trunk/dist/mcon/pl/files.pl 2008-05-28 08:01:59 UTC (rev 22) > +++ trunk/dist/mcon/pl/files.pl 2008-05-28 08:05:12 UTC (rev 23) > @@ -102,8 +102,7 @@ > # Remove ':' quotations in front of the lines > sub q { > local($_) = @_; > - local($*) = 1; > - s/^://g; > + s/^://gm; > $_; > } Here's the full list again of what I changed in 3.5-20: diff -pur dist-3.5-19/bin/manilist.SH dist-3.5-20/bin/manilist.SH --- dist-3.5-19/bin/manilist.SH 2006-08-24 14:32:52.000000000 +0200 +++ dist-3.5-20/bin/manilist.SH 2008-01-04 18:22:54.000000000 +0100 @@ -472,8 +472,7 @@ EOF # Remove ':' quotations in front of the lines sub q { local($_) = @_; - local($*) = 1; - s/^://g; + s/^://gm; $_; } diff -pur dist-3.5-19/bin/perload dist-3.5-20/bin/perload --- dist-3.5-19/bin/perload 2006-08-24 14:32:52.000000000 +0200 +++ dist-3.5-20/bin/perload 2008-01-04 18:19:01.000000000 +0100 @@ -273,8 +273,7 @@ if (@Data > 0) { : unless seek(main'DATA, $pos, 0); : local($/) = "\n}"; : local($body) = scalar(<main'DATA>); -: local($*) = 1; -: die "End of file found while loading $_[0].\n" unless $body =~ /^\}$/; +: die "End of file found while loading $_[0].\n" unless $body =~ /^\}$/m; EOC if ($opt_t) { print &q(<<'EOC'); @@ -462,8 +461,7 @@ sub flush_comment { sub q { local($_) = @_; - local($*) = 1; - s/^://g; + s/^://gm; $_; } diff -pur dist-3.5-19/jmake/jmake.SH dist-3.5-20/jmake/jmake.SH --- dist-3.5-19/jmake/jmake.SH 2006-08-24 14:32:52.000000000 +0200 +++ dist-3.5-20/jmake/jmake.SH 2008-01-04 18:32:20.000000000 +0100 @@ -143,13 +143,11 @@ while (<CPP>) { s/@!\s?/\n/g; s/@@\s?/\n\t/g; - $* = 1; # A '\r' is added to all lines, in order to let 'split' keep them # As lines ending with '\' won't fit in the next regular # expression (why ?), we have to treat that special case separately - s/\n$/\r\n/g; - s/\\\s*$/\\\r/g; # Remove spaces after final '\' and add '\r' - $* = 0; + s/\n$/\r\n/gm; + s/\\\s*$/\\\r/gm; # Remove spaces after final '\' and add '\r' @macro = split(/\n/); for ($i = 0; $i <= $#macro; $i++) { chop($_ = $macro[$i]); # Remove final '\r' diff -pur dist-3.5-19/mcon/pl/cosmetic.pl dist-3.5-20/mcon/pl/cosmetic.pl --- dist-3.5-19/mcon/pl/cosmetic.pl 2006-08-24 14:32:52.000000000 +0200 +++ dist-3.5-20/mcon/pl/cosmetic.pl 2008-01-04 18:30:26.000000000 +0100 @@ -47,26 +47,22 @@ sub cosmetic_update { $/ = "\n"; close NEWMANI; - $* = 1; # Multi-line matching - - &mani_add('Configure', 'Portability tool', $spaces) unless /^Configure\b/; + &mani_add('Configure', 'Portability tool', $spaces) unless /^Configure\b/m; &mani_add('config_h.SH', 'Produces config.h', $spaces) - unless /^config_h\.SH\b/ || !-f 'config_h.SH'; + unless /^config_h\.SH\b/m || !-f 'config_h.SH'; &mani_add('confmagic.h', 'Magic symbol remapping', $spaces) - if $opt_M && !/^confmagic\.h\b/; + if $opt_M && !/^confmagic\.h\b/m; - &mani_remove('config_h.SH') if /^config_h\.SH\b/ && !-f 'config_h.SH'; - &mani_remove('confmagic.h') if /^confmagic.h\b/ && !$opt_M; + &mani_remove('config_h.SH') if /^config_h\.SH\b/m && !-f 'config_h.SH'; + &mani_remove('confmagic.h') if /^confmagic.h\b/m && !$opt_M; if ($opt_G) { # Want a GNU-like configure wrapper &add_configure; &mani_add('configure', 'GNU configure-like wrapper', $spaces) - if !/^configure\s/ && -f 'configure'; + if !/^configure\s/m && -f 'configure'; } else { - &mani_remove('configure') if /^configure\s/ && !-f 'configure'; + &mani_remove('configure') if /^configure\s/m && !-f 'configure'; } - - $* = 0; } # Add file to MANIFEST.new, with properly indented comment diff -pur dist-3.5-19/mcon/pl/makefile.pl dist-3.5-20/mcon/pl/makefile.pl --- dist-3.5-19/mcon/pl/makefile.pl 2006-08-24 14:32:52.000000000 +0200 +++ dist-3.5-20/mcon/pl/makefile.pl 2008-01-04 18:30:48.000000000 +0100 @@ -90,15 +90,13 @@ sub build_private { print MAKEFILE "SHELL = /bin/sh\n"; print MAKEFILE "W = $wanted\n"; $saved_dependencies = $dependencies; - $* = 1; foreach $sym (@Cond) { if ($symwanted{$sym}) { - $dependencies =~ s/\+($sym\s)/$1/g; + $dependencies =~ s/\+($sym\s)/$1/gm; } else { - $dependencies =~ s/\+$sym(\s)/$1/g; + $dependencies =~ s/\+$sym(\s)/$1/gm; } } - $* = 0; print MAKEFILE $dependencies; close MAKEFILE; } @@ -161,15 +159,13 @@ sub update_makefile { open(MAKEFILE,">Makefile") || die "Can't create .MT/Makefile.\n"; print MAKEFILE "SHELL = /bin/sh\n"; print MAKEFILE "W = $wanted\n"; - $* = 1; foreach $sym (@Cond) { if ($symwanted{$sym}) { - $saved_dependencies =~ s/\+($sym\s)/$1/g; + $saved_dependencies =~ s/\+($sym\s)/$1/gm; } else { - $saved_dependencies =~ s/\+$sym(\s)/$1/g; + $saved_dependencies =~ s/\+$sym(\s)/$1/gm; } } - $* = 0; print MAKEFILE $saved_dependencies; close MAKEFILE; } diff -pur dist-3.5-19/pat/patlog.SH dist-3.5-20/pat/patlog.SH --- dist-3.5-19/pat/patlog.SH 2006-08-24 14:32:52.000000000 +0200 +++ dist-3.5-20/pat/patlog.SH 2008-01-04 18:31:44.000000000 +0100 @@ -103,12 +103,10 @@ if (-s ".logs$bnum") { } } close LOGS; - $* = 1; $subj = $logs; - $logs =~ s/^patch\d+:\s*/\t/g; - $logs =~ s/\n/\n\n/g; - $subj =~ s/^patch\d+:\s*/Subject: /g; - $* = 0; + $logs =~ s/^patch\d+:\s*/\t/gm; + $logs =~ s/\n/\n\n/gm; + $subj =~ s/^patch\d+:\s*/Subject: /gm; } else { $subj = "Subject: \n"; } diff -pur dist-3.5-19/pat/patmake.SH dist-3.5-20/pat/patmake.SH --- dist-3.5-19/pat/patmake.SH 2006-08-24 14:32:52.000000000 +0200 +++ dist-3.5-20/pat/patmake.SH 2008-01-04 18:31:28.000000000 +0100 @@ -107,15 +107,13 @@ if ($#ARGV > 0) { $mf .= $_ if /^[a-z.]+\s*:/; # Rules in makefile } } -$* = 1; $after = ''; $after .= "\t\tConfigure -ders\n" if -f 'Configure'; -$after .= "\t\tmake depend\n" if $mf =~ /^depend:/; +$after .= "\t\tmake depend\n" if $mf =~ /^depend:/m; $after .= "\t\tmake\n" if $mf; -$after .= "\t\tmake test\n" if $mf =~ /^test:/; -$after .= "\t\tmake install\n" if $mf =~ /^install:/; -$after .= "\t\tmake install.man\n" if $mf =~ /^install\.man:/; -$* = 0; +$after .= "\t\tmake test\n" if $mf =~ /^test:/m; +$after .= "\t\tmake install\n" if $mf =~ /^install:/m; +$after .= "\t\tmake install.man\n" if $mf =~ /^install\.man:/m; chdir 'bugs' if -d 'bugs'; die "$progname: patch #$bnum already exists.\n" if -f "patch$bnum"; -- H.Merijn Brand Amsterdam Perl Mongers (http://amsterdam.pm.org/) using & porting perl 5.6.2, 5.8.x, 5.10.x on HP-UX 10.20, 11.00, 11.11, & 11.23, SuSE 10.1 & 10.2, AIX 5.2, and Cygwin. http://qa.perl.org http://mirrors.develooper.com/hpux/ http://www.test-smoke.org http://www.goldmark.org/jeff/stupid-disclaimers/ |
From: <rma...@us...> - 2008-05-28 08:05:27
|
Revision: 23 http://dist.svn.sourceforge.net/dist/?rev=23&view=rev Author: rmanfredi Date: 2008-05-28 01:05:12 -0700 (Wed, 28 May 2008) Log Message: ----------- Removed last instance of $*, no longer supported in Perl 5.10. Modified Paths: -------------- trunk/dist/mcon/pl/files.pl Modified: trunk/dist/mcon/pl/files.pl =================================================================== --- trunk/dist/mcon/pl/files.pl 2008-05-28 08:01:59 UTC (rev 22) +++ trunk/dist/mcon/pl/files.pl 2008-05-28 08:05:12 UTC (rev 23) @@ -102,8 +102,7 @@ # Remove ':' quotations in front of the lines sub q { local($_) = @_; - local($*) = 1; - s/^://g; + s/^://gm; $_; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2008-05-28 08:02:14
|
Revision: 22 http://dist.svn.sourceforge.net/dist/?rev=22&view=rev Author: rmanfredi Date: 2008-05-28 01:01:59 -0700 (Wed, 28 May 2008) Log Message: ----------- Perl 5.10 no longer supports "$*" anywhere... even in the initial exec line meant to be parsed by the shell... Modified Paths: -------------- trunk/dist/mcon/makegloss.SH trunk/dist/mcon/mconfig.SH trunk/dist/mcon/mlint.SH trunk/dist/mcon/mxref.SH Modified: trunk/dist/mcon/makegloss.SH =================================================================== --- trunk/dist/mcon/makegloss.SH 2008-05-28 07:58:50 UTC (rev 21) +++ trunk/dist/mcon/makegloss.SH 2008-05-28 08:01:59 UTC (rev 22) @@ -17,7 +17,7 @@ echo "Extracting mcon/makegloss (with variable substitutions)" $spitshell >makegloss <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; !GROK!THIS! Modified: trunk/dist/mcon/mconfig.SH =================================================================== --- trunk/dist/mcon/mconfig.SH 2008-05-28 07:58:50 UTC (rev 21) +++ trunk/dist/mcon/mconfig.SH 2008-05-28 08:01:59 UTC (rev 22) @@ -17,7 +17,7 @@ echo "Extracting mcon/mconfig (with variable substitutions)" cat >mconfig <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/mcon/mlint.SH =================================================================== --- trunk/dist/mcon/mlint.SH 2008-05-28 07:58:50 UTC (rev 21) +++ trunk/dist/mcon/mlint.SH 2008-05-28 08:01:59 UTC (rev 22) @@ -17,7 +17,7 @@ echo "Extracting mcon/mlint (with variable substitutions)" cat >mlint <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ Modified: trunk/dist/mcon/mxref.SH =================================================================== --- trunk/dist/mcon/mxref.SH 2008-05-28 07:58:50 UTC (rev 21) +++ trunk/dist/mcon/mxref.SH 2008-05-28 08:01:59 UTC (rev 22) @@ -17,7 +17,7 @@ echo "Extracting mcon/mxref (with variable substitutions)" cat >mxref <<!GROK!THIS! $startperl - eval "exec perl -S \$0 \$*" + eval 'exec perl -S \$0 \${1+"\$@"}' if \$running_under_some_shell; # $Id$ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2008-05-28 07:58:57
|
Revision: 21 http://dist.svn.sourceforge.net/dist/?rev=21&view=rev Author: rmanfredi Date: 2008-05-28 00:58:50 -0700 (Wed, 28 May 2008) Log Message: ----------- Reset CDPATH to avoid pdksh's emission of the chosen dir on "cd". Modified Paths: -------------- trunk/dist/install.SH Modified: trunk/dist/install.SH =================================================================== --- trunk/dist/install.SH 2008-01-04 23:14:00 UTC (rev 20) +++ trunk/dist/install.SH 2008-05-28 07:58:50 UTC (rev 21) @@ -55,6 +55,8 @@ uid="" gid="" +CDPATH="" + # simulates mkdir -p mkdir_p=' name=$1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2008-01-04 23:14:09
|
Revision: 20 http://dist.svn.sourceforge.net/dist/?rev=20&view=rev Author: rmanfredi Date: 2008-01-04 15:14:00 -0800 (Fri, 04 Jan 2008) Log Message: ----------- Applied diff from H.Merijn Brand to keep it working with perl 5.10, which no longer supports the old $* perl4 variable to request multiline matching. Modified Paths: -------------- trunk/dist/bin/manilist.SH trunk/dist/bin/perload trunk/dist/jmake/jmake.SH trunk/dist/mcon/pl/cosmetic.pl trunk/dist/mcon/pl/makefile.pl trunk/dist/pat/patlog.SH trunk/dist/pat/patmake.SH Modified: trunk/dist/bin/manilist.SH =================================================================== --- trunk/dist/bin/manilist.SH 2007-08-13 12:14:08 UTC (rev 19) +++ trunk/dist/bin/manilist.SH 2008-01-04 23:14:00 UTC (rev 20) @@ -472,8 +472,7 @@ # Remove ':' quotations in front of the lines sub q { local($_) = @_; - local($*) = 1; - s/^://g; + s/^://gm; $_; } Modified: trunk/dist/bin/perload =================================================================== --- trunk/dist/bin/perload 2007-08-13 12:14:08 UTC (rev 19) +++ trunk/dist/bin/perload 2008-01-04 23:14:00 UTC (rev 20) @@ -273,8 +273,7 @@ : unless seek(main'DATA, $pos, 0); : local($/) = "\n}"; : local($body) = scalar(<main'DATA>); -: local($*) = 1; -: die "End of file found while loading $_[0].\n" unless $body =~ /^\}$/; +: die "End of file found while loading $_[0].\n" unless $body =~ /^\}$/m; EOC if ($opt_t) { print &q(<<'EOC'); @@ -462,8 +461,7 @@ sub q { local($_) = @_; - local($*) = 1; - s/^://g; + s/^://gm; $_; } Modified: trunk/dist/jmake/jmake.SH =================================================================== --- trunk/dist/jmake/jmake.SH 2007-08-13 12:14:08 UTC (rev 19) +++ trunk/dist/jmake/jmake.SH 2008-01-04 23:14:00 UTC (rev 20) @@ -143,13 +143,11 @@ s/@!\s?/\n/g; s/@@\s?/\n\t/g; - $* = 1; # A '\r' is added to all lines, in order to let 'split' keep them # As lines ending with '\' won't fit in the next regular # expression (why ?), we have to treat that special case separately - s/\n$/\r\n/g; - s/\\\s*$/\\\r/g; # Remove spaces after final '\' and add '\r' - $* = 0; + s/\n$/\r\n/gm; + s/\\\s*$/\\\r/gm; # Remove spaces after final '\' and add '\r' @macro = split(/\n/); for ($i = 0; $i <= $#macro; $i++) { chop($_ = $macro[$i]); # Remove final '\r' Modified: trunk/dist/mcon/pl/cosmetic.pl =================================================================== --- trunk/dist/mcon/pl/cosmetic.pl 2007-08-13 12:14:08 UTC (rev 19) +++ trunk/dist/mcon/pl/cosmetic.pl 2008-01-04 23:14:00 UTC (rev 20) @@ -47,26 +47,22 @@ $/ = "\n"; close NEWMANI; - $* = 1; # Multi-line matching - - &mani_add('Configure', 'Portability tool', $spaces) unless /^Configure\b/; + &mani_add('Configure', 'Portability tool', $spaces) unless /^Configure\b/m; &mani_add('config_h.SH', 'Produces config.h', $spaces) - unless /^config_h\.SH\b/ || !-f 'config_h.SH'; + unless /^config_h\.SH\b/m || !-f 'config_h.SH'; &mani_add('confmagic.h', 'Magic symbol remapping', $spaces) - if $opt_M && !/^confmagic\.h\b/; + if $opt_M && !/^confmagic\.h\b/m; - &mani_remove('config_h.SH') if /^config_h\.SH\b/ && !-f 'config_h.SH'; - &mani_remove('confmagic.h') if /^confmagic.h\b/ && !$opt_M; + &mani_remove('config_h.SH') if /^config_h\.SH\b/m && !-f 'config_h.SH'; + &mani_remove('confmagic.h') if /^confmagic.h\b/m && !$opt_M; if ($opt_G) { # Want a GNU-like configure wrapper &add_configure; &mani_add('configure', 'GNU configure-like wrapper', $spaces) - if !/^configure\s/ && -f 'configure'; + if !/^configure\s/m && -f 'configure'; } else { - &mani_remove('configure') if /^configure\s/ && !-f 'configure'; + &mani_remove('configure') if /^configure\s/m && !-f 'configure'; } - - $* = 0; } # Add file to MANIFEST.new, with properly indented comment Modified: trunk/dist/mcon/pl/makefile.pl =================================================================== --- trunk/dist/mcon/pl/makefile.pl 2007-08-13 12:14:08 UTC (rev 19) +++ trunk/dist/mcon/pl/makefile.pl 2008-01-04 23:14:00 UTC (rev 20) @@ -90,15 +90,13 @@ print MAKEFILE "SHELL = /bin/sh\n"; print MAKEFILE "W = $wanted\n"; $saved_dependencies = $dependencies; - $* = 1; foreach $sym (@Cond) { if ($symwanted{$sym}) { - $dependencies =~ s/\+($sym\s)/$1/g; + $dependencies =~ s/\+($sym\s)/$1/gm; } else { - $dependencies =~ s/\+$sym(\s)/$1/g; + $dependencies =~ s/\+$sym(\s)/$1/gm; } } - $* = 0; print MAKEFILE $dependencies; close MAKEFILE; } @@ -161,15 +159,13 @@ open(MAKEFILE,">Makefile") || die "Can't create .MT/Makefile.\n"; print MAKEFILE "SHELL = /bin/sh\n"; print MAKEFILE "W = $wanted\n"; - $* = 1; foreach $sym (@Cond) { if ($symwanted{$sym}) { - $saved_dependencies =~ s/\+($sym\s)/$1/g; + $saved_dependencies =~ s/\+($sym\s)/$1/gm; } else { - $saved_dependencies =~ s/\+$sym(\s)/$1/g; + $saved_dependencies =~ s/\+$sym(\s)/$1/gm; } } - $* = 0; print MAKEFILE $saved_dependencies; close MAKEFILE; } Modified: trunk/dist/pat/patlog.SH =================================================================== --- trunk/dist/pat/patlog.SH 2007-08-13 12:14:08 UTC (rev 19) +++ trunk/dist/pat/patlog.SH 2008-01-04 23:14:00 UTC (rev 20) @@ -103,12 +103,10 @@ } } close LOGS; - $* = 1; $subj = $logs; - $logs =~ s/^patch\d+:\s*/\t/g; - $logs =~ s/\n/\n\n/g; - $subj =~ s/^patch\d+:\s*/Subject: /g; - $* = 0; + $logs =~ s/^patch\d+:\s*/\t/gm; + $logs =~ s/\n/\n\n/gm; + $subj =~ s/^patch\d+:\s*/Subject: /gm; } else { $subj = "Subject: \n"; } Modified: trunk/dist/pat/patmake.SH =================================================================== --- trunk/dist/pat/patmake.SH 2007-08-13 12:14:08 UTC (rev 19) +++ trunk/dist/pat/patmake.SH 2008-01-04 23:14:00 UTC (rev 20) @@ -107,15 +107,13 @@ $mf .= $_ if /^[a-z.]+\s*:/; # Rules in makefile } } -$* = 1; $after = ''; $after .= "\t\tConfigure -ders\n" if -f 'Configure'; -$after .= "\t\tmake depend\n" if $mf =~ /^depend:/; +$after .= "\t\tmake depend\n" if $mf =~ /^depend:/m; $after .= "\t\tmake\n" if $mf; -$after .= "\t\tmake test\n" if $mf =~ /^test:/; -$after .= "\t\tmake install\n" if $mf =~ /^install:/; -$after .= "\t\tmake install.man\n" if $mf =~ /^install\.man:/; -$* = 0; +$after .= "\t\tmake test\n" if $mf =~ /^test:/m; +$after .= "\t\tmake install\n" if $mf =~ /^install:/m; +$after .= "\t\tmake install.man\n" if $mf =~ /^install\.man:/m; chdir 'bugs' if -d 'bugs'; die "$progname: patch #$bnum already exists.\n" if -f "patch$bnum"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2007-08-13 12:14:10
|
Revision: 19 http://dist.svn.sourceforge.net/dist/?rev=19&view=rev Author: rmanfredi Date: 2007-08-13 05:14:08 -0700 (Mon, 13 Aug 2007) Log Message: ----------- Linux does not like ^M as line endings: cpp 4.1.x complains. Try with ^A, hoping it will continue to work on HP-UX. Modified Paths: -------------- trunk/dist/jmake/fixcpp.SH Modified: trunk/dist/jmake/fixcpp.SH =================================================================== --- trunk/dist/jmake/fixcpp.SH 2006-12-27 10:35:09 UTC (rev 18) +++ trunk/dist/jmake/fixcpp.SH 2007-08-13 12:14:08 UTC (rev 19) @@ -43,7 +43,7 @@ # This program is meant to be called from jmake. All it does is pre-process # the file it is given as argument, focusing on #include directives and # resolving them as cpp would (but without the #line stuff since we don't -# really care about it), escaping all the trailing \ into '\ ^M'. The resulting +# really care about it), escaping all the trailing \ into '\ ^A'. The resulting # temporary file is then handed off to the real cpp for macro processing, and # the output is printed on stdout, after restoration of any original trailing \. # Again, thanks HP-UX for making this so challenging and exciting... :-) @@ -135,7 +135,7 @@ # Don't escape trailing backslashes in macro definition or cpp # won't see them as macro continuation any longer, and also within # macro definitions, all those @@ or @! continuations... - s/\\$/\\ \015/ unless /\@[!@]\\$/ || /^#define/; + s/\\$/\\ \001/ unless /\@[!@]\\$/ || /^#define/; } # Append file to given (opened) file descriptor @@ -172,7 +172,7 @@ local($file) = @_; open(CPP, "$cpp $cpp_opt $file |") || die "Can't fork: $!\n"; while (<CPP>) { - s/\\ \015$/\\/; # Un-escape trailing \ + s/\\ \001$/\\/; # Un-escape trailing \ print STDOUT; } close CPP; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-12-27 10:35:16
|
Revision: 18 http://svn.sourceforge.net/dist/?rev=18&view=rev Author: rmanfredi Date: 2006-12-27 02:35:09 -0800 (Wed, 27 Dec 2006) Log Message: ----------- Added InstallProgramNoStrip() to request installation of a program without stripping the debugging symbols. Modified Paths: -------------- trunk/dist/jmake/files/Jmake.rules Modified: trunk/dist/jmake/files/Jmake.rules =================================================================== --- trunk/dist/jmake/files/Jmake.rules 2006-11-04 12:13:28 UTC (rev 17) +++ trunk/dist/jmake/files/Jmake.rules 2006-12-27 10:35:09 UTC (rev 18) @@ -376,6 +376,20 @@ /* + * InstallProgramNoStripWithFlags: + * Generate rules to install an executable program using given + * install flags. + */ +#define InstallProgramNoStripWithFlags(program,dest,flags) @!\ +local_install:: program @@\ + _MakeInstallDirIgnore(dest) \ @@\ + $(INSTALL) -c -m 555 flags program^^^$(_EXE) $(INSTALL_PREFIX)^^^dest @!\ + @!\ +local_deinstall:: @@\ + $(RM) $(INSTALL_PREFIX)^^^dest/program^^^$(_EXE) + + +/* * InstallProgram: * Generate rules to install an executable program using any special * install flags set in $(INSTALLFLAGS). @@ -385,6 +399,16 @@ /* + * InstallProgramNoStrip: + * Generate rules to install an executable program using any special + * install flags set in $(INSTALLFLAGS), but without stripping the + * executable from debugging symbols. + */ +#define InstallProgramNoStrip(program,dest) @!\ +InstallProgramNoStripWithFlags(program,dest,^^) + + +/* * InstallScriptWithFlags: * Generate rules to install an executable script using given * install flags. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-11-04 12:14:08
|
Revision: 17 http://svn.sourceforge.net/dist/?rev=17&view=rev Author: rmanfredi Date: 2006-11-04 04:13:28 -0800 (Sat, 04 Nov 2006) Log Message: ----------- Applied patch from Christian Biere, which adds "-Wshadow" to gcc 3.x flags. Modified Paths: -------------- trunk/dist/mcon/U/ccflags.U Modified: trunk/dist/mcon/U/ccflags.U =================================================================== --- trunk/dist/mcon/U/ccflags.U 2006-11-04 12:11:51 UTC (rev 16) +++ trunk/dist/mcon/U/ccflags.U 2006-11-04 12:13:28 UTC (rev 17) @@ -150,8 +150,8 @@ ?X: turn warnings on if they're using gcc case "$gccversion" in 1*|2*) dflt="$dflt -Wall";; -?X: starting with version 3, add "-W -Wall -Wformat=2" by default - *) dflt="$dflt -W -Wall -Wformat=2";; +?X: starting with version 3, add "-W -Wall -Wformat=2 -Wshadow" by default + *) dflt="$dflt -W -Wall -Wformat=2 -Wshadow";; esac ;; esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-11-04 12:12:46
|
Revision: 16 http://svn.sourceforge.net/dist/?rev=16&view=rev Author: rmanfredi Date: 2006-11-04 04:11:51 -0800 (Sat, 04 Nov 2006) Log Message: ----------- Taught metaxref to use MANIFEST if MANIFEST.new is missing. Modified Paths: -------------- trunk/dist/mcon/mxref.SH Modified: trunk/dist/mcon/mxref.SH =================================================================== --- trunk/dist/mcon/mxref.SH 2006-08-30 18:21:51 UTC (rev 15) +++ trunk/dist/mcon/mxref.SH 2006-11-04 12:11:51 UTC (rev 16) @@ -74,7 +74,7 @@ &usage; } -$NEWMANI = $opt_f || 'MANIFEST.new'; +$NEWMANI = $opt_f || (-f 'MANIFEST.new' ? 'MANIFEST.new' : 'MANIFEST'); &init; # Various initializations `mkdir .MT 2>&1` unless -d '.MT'; # For private temporary files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-30 18:22:43
|
Revision: 15 http://svn.sourceforge.net/dist/?rev=15&view=rev Author: rmanfredi Date: 2006-08-30 11:21:51 -0700 (Wed, 30 Aug 2006) Log Message: ----------- Added I_SYS_POLL and I_POLL since we cannot rely on HAS_POLL being enough to include <poll.h>. Modified Paths: -------------- trunk/dist/MANIFEST trunk/dist/mcon/U/d_poll.U Added Paths: ----------- trunk/dist/mcon/U/i_poll.U trunk/dist/mcon/U/i_syspoll.U Modified: trunk/dist/MANIFEST =================================================================== --- trunk/dist/MANIFEST 2006-08-28 16:51:14 UTC (rev 14) +++ trunk/dist/MANIFEST 2006-08-30 18:21:51 UTC (rev 15) @@ -405,6 +405,7 @@ mcon/U/i_ndbm.U Shall we include <ndbm.h>? mcon/U/i_neterrno.U Shall we include <net/errno.h>? mcon/U/i_niin.U Shall we include <netinet/in.h>? +mcon/U/i_poll.U Shall we include <poll.h>? mcon/U/i_pwd.U Shall we include <pwd.h>? mcon/U/i_regex.U Shall we include <regex.h>? mcon/U/i_sfio.U Shall we include <sfio.h>? @@ -417,6 +418,7 @@ mcon/U/i_sysmman.U Do we have to include <sys/mman.h>? mcon/U/i_sysndir.U Shall we include <sys/ndir.h>? mcon/U/i_sysparam.U Shall we include <sys/param.h>? +mcon/U/i_syspoll.U Shall we include <sys/poll.h>? mcon/U/i_sysresrc.U Shall we include <sys/resource.h>? mcon/U/i_sysselct.U Shall we include <sys/select.h>? mcon/U/i_syssock.U Shall we include <sys/socket.h>? Modified: trunk/dist/mcon/U/d_poll.U =================================================================== --- trunk/dist/mcon/U/d_poll.U 2006-08-28 16:51:14 UTC (rev 14) +++ trunk/dist/mcon/U/d_poll.U 2006-08-30 18:21:51 UTC (rev 15) @@ -24,8 +24,8 @@ ?S:. ?C:HAS_POLL : ?C: This symbol, if defined, indicates that the poll routine is -?C: available to poll active file descriptors. You may safely -?C: include <poll.h> when this symbol is defined. +?C: available to poll active file descriptors. Please check I_POLL and +?C: I_SYS_POLL to know which header should be included as well. ?C:. ?H:#$d_poll HAS_POLL /**/ ?H:. Added: trunk/dist/mcon/U/i_poll.U =================================================================== --- trunk/dist/mcon/U/i_poll.U (rev 0) +++ trunk/dist/mcon/U/i_poll.U 2006-08-30 18:21:51 UTC (rev 15) @@ -0,0 +1,28 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?MAKE:i_poll: Inhdr +?MAKE: -pick add $@ %< +?S:i_poll: +?S: This variable conditionally defines the I_POLL symbol, which +?S: indicates to the C program that it should include <poll.h>. +?S:. +?C:I_POLL: +?C: This symbol, if defined, indicates that the program may include +?C: <poll.h>. If there is no <poll.h>, then you may check I_SYS_POLL +?C: instead to see whether there is a <sys/poll.h> to include. +?C:. +?H:#$i_poll I_POLL /**/ +?H:. +?LINT:set i_poll +: see if there is a poll.h file +set poll.h i_poll +eval $inhdr + Property changes on: trunk/dist/mcon/U/i_poll.U ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Added: trunk/dist/mcon/U/i_syspoll.U =================================================================== --- trunk/dist/mcon/U/i_syspoll.U (rev 0) +++ trunk/dist/mcon/U/i_syspoll.U 2006-08-30 18:21:51 UTC (rev 15) @@ -0,0 +1,28 @@ +?RCS: $Id$ +?RCS: +?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi +?RCS: +?RCS: You may redistribute only under the terms of the Artistic Licence, +?RCS: as specified in the README file that comes with the distribution. +?RCS: You may reuse parts of this distribution only within the terms of +?RCS: that same Artistic Licence; a copy of which may be found at the root +?RCS: of the source tree for dist 4.0. +?RCS: +?MAKE:i_syspoll: Inhdr +?MAKE: -pick add $@ %< +?S:i_syspoll: +?S: This variable conditionally defines the I_SYS_POLL symbol, which +?S: indicates to the C program that it should include <sys/poll.h>. +?S:. +?C:I_SYS_POLL: +?C: This symbol, if defined, indicates that the program may include +?C: <sys/poll.h>. When I_POLL is also defined, it's probably safest +?C: to only include <poll.h>. +?C:. +?H:#$i_syspoll I_SYS_POLL /**/ +?H:. +?LINT:set i_syspoll +: see if there is a sys/poll.h file +set sys/poll.h i_syspoll +eval $inhdr + Property changes on: trunk/dist/mcon/U/i_syspoll.U ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-28 16:51:20
|
Revision: 14 Author: rmanfredi Date: 2006-08-28 09:51:14 -0700 (Mon, 28 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=14&view=rev Log Message: ----------- Do not list special unit "Mcc" as being made. Modified Paths: -------------- trunk/dist/mcon/U/Loc.U Modified: trunk/dist/mcon/U/Loc.U =================================================================== --- trunk/dist/mcon/U/Loc.U 2006-08-28 16:48:29 UTC (rev 13) +++ trunk/dist/mcon/U/Loc.U 2006-08-28 16:51:14 UTC (rev 14) @@ -61,14 +61,14 @@ ?X: I put startsh at the end of the dependency list, in order to avoid the ?X: loading of the spitshell unit before the instructions. ?X: -?MAKE:Loc Mcc awk ar bash bison byacc cat chgrp chmod chown \ +?MAKE:Loc awk ar bash bison byacc cat chgrp chmod chown \ comm compress cp cpio cpp csh date echo egrep emacs expr find flex \ gmake gzip grep inews ksh less line lint ln lp lpr ls mail mailx \ make mkdir more mv nm nroff perl pg pmake pr rm rmail sed sendmail \ shar sleep smail sort submit tail tar tbl tee test touch tr troff \ uname uniq uuname vi zcat zip: eunicefix n c startsh Instruct Warn ?MAKE: -pick weed $@ %< -?LINT: describe Mcc awk ar bash bison byacc cat chgrp chmod chown \ +?LINT: describe awk ar bash bison byacc cat chgrp chmod chown \ comm compress cp cpio cpp csh date echo egrep emacs expr find flex \ gmake gzip grep inews ksh less line lint ln lp lpr ls mail mailx \ make mkdir more mv nm nroff perl pg pmake pr rm rmail sed sendmail \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-28 16:48:36
|
Revision: 13 Author: rmanfredi Date: 2006-08-28 09:48:29 -0700 (Mon, 28 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=13&view=rev Log Message: ----------- Removed stale Mcc dependency. Modified Paths: -------------- trunk/dist/mcon/U/gccvers.U Modified: trunk/dist/mcon/U/gccvers.U =================================================================== --- trunk/dist/mcon/U/gccvers.U 2006-08-28 16:44:41 UTC (rev 12) +++ trunk/dist/mcon/U/gccvers.U 2006-08-28 16:48:29 UTC (rev 13) @@ -11,7 +11,7 @@ ?RCS: Copyright (c) 2000, Jarkko Hietaniemi ?RCS: ?MAKE:gccversion gccosandvers: cat cpp rm +cc \ - Mcc Myread Guess Options Oldconfig Loc osname osvers grep run ccname + Myread Guess Options Oldconfig Loc osname osvers grep run ccname ?MAKE: -pick add $@ %< ?S:gccversion: ?S: If GNU cc (gcc) is used, this variable holds '1' or '3' (for instance) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-28 16:44:56
|
Revision: 12 Author: rmanfredi Date: 2006-08-28 09:44:41 -0700 (Mon, 28 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=12&view=rev Log Message: ----------- Default to "-O2 -g" when using gcc. Modified Paths: -------------- trunk/dist/mcon/U/ccflags.U Modified: trunk/dist/mcon/U/ccflags.U =================================================================== --- trunk/dist/mcon/U/ccflags.U 2006-08-25 22:35:20 UTC (rev 11) +++ trunk/dist/mcon/U/ccflags.U 2006-08-28 16:44:41 UTC (rev 12) @@ -94,10 +94,16 @@ : determine optimize, if desired, or use for debug flag also case "$optimize" in ' '|$undef) dflt='none';; -'') dflt='-O';; +'') + case "$gccversion" in + '') dflt='-O';; + *) dflt='-O2 -g';; + esac + ;; *) dflt="$optimize";; esac -$cat <<EOH +case "$gccversion" in +'') $cat <<EOH Some C compilers have problems with their optimizers. By default, $package compiles with the -O flag to use the optimizer. Alternately, you might want @@ -106,6 +112,17 @@ the word "none". EOH + ;; +*) $cat <<EOH + +With the GNU C compiler, it is possible to supply both -O2 and -g flags, to +be able to reasonably optimize, whilst retaining the ability to use a +symbolic debugger. Either flag can be specified here. To use neither flag, +specify the word "none". + +EOH + ;; +esac rp="What optimizer/debugger flag should be used?" . ./myread optimize="$ans" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-25 22:35:33
|
Revision: 11 Author: rmanfredi Date: 2006-08-25 15:35:20 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=11&view=rev Log Message: ----------- This starts the dist-3.5 baseline. Modified Paths: -------------- trunk/dist/Configure trunk/dist/patchlevel.h Modified: trunk/dist/Configure =================================================================== --- trunk/dist/Configure 2006-08-25 22:33:07 UTC (rev 10) +++ trunk/dist/Configure 2006-08-25 22:35:20 UTC (rev 11) @@ -13,12 +13,12 @@ # # Note: this Configure script was generated automatically. Rather than # working with this copy of Configure, you may wish to get metaconfig. -# The dist package (which contains metaconfig) is available at -# http://sourceforge.net/projects/dist/ +# The dist package (which contains metaconfig) is available via SVN: +# svn co https://svn.sourceforge.net/svnroot/dist/trunk/dist -# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp ram $ +# $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Sun Feb 8 21:03:36 MET 2004 [metaconfig 3.0 PL70] +# Generated on Sat Aug 26 00:34:34 MEST 2006 [metaconfig 3.5 PL0] cat >c1$$ <<EOF ARGGGHHHH!!!!! @@ -170,11 +170,13 @@ to='' usecrosscompile='' d_bsd='' +d_dos='' d_eunice='' d_linux='' +d_os2='' d_xenix='' +_exe='' eunicefix='' -Mcc='' ar='' awk='' bash='' @@ -259,12 +261,18 @@ Source='' State='' _a='' -_exe='' _o='' archobjs='' firstmakefile='' afs='' +afsroot='' baserev='' +ccflags='' +cppflags='' +ldflags='' +lkflags='' +locincpth='' +optimize='' cf_email='' cf_by='' cf_time='' @@ -276,9 +284,16 @@ cppstdin='' d_portable='' defeditor='' +gccosandvers='' +gccversion='' install='' installdir='' issymlink='' +glibpth='' +libpth='' +loclibpth='' +plibpth='' +xlibpth='' lns='' mailer='' make_set_make='' @@ -286,7 +301,6 @@ manext='' mansrc='' mansrcexp='' -mkdep='' mydomain='' myhostname='' phostname='' @@ -305,6 +319,7 @@ pager='' patchlevel='' perlpath='' +pkgsrc='' prefix='' prefixexp='' installprivlib='' @@ -322,6 +337,9 @@ startsh='' sysman='' trnl='' +incpath='' +mips_type='' +usrinc='' CONFIG='' : Initialize wide constants @@ -352,18 +370,42 @@ elif test -d c:/. ; then : OS/2 or cygwin _exe=".exe" +else + : All other UNIX systems + _exe="" fi ccname='' ccversion='' -: No trailing extension on UNIX executables -_exe='' : Extra object files, if any, needed on this platform. archobjs='' bin='/usr/local/bin' cc='cc' -cppflags='' -usrinc='/usr/include' +: Possible local include directories to search. +: Set locincpth to "" in a hint file to defeat local include searches. +locincpth="/usr/local/include /opt/local/include /usr/gnu/include" +locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" +: +: no include file wanted by default +inclwanted='' + +: change the next line if compiling for Xenix/286 on Xenix/386 +xlibpth='/usr/lib/386 /lib/386' +: Possible local library directories to search. +loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" +loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" + +: general looking path for locating libraries +glibpth="/lib /usr/lib $xlibpth" +glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" +test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" +test -f /shlib/libc.so && glibpth="/shlib $glibpth" + +: Private path used by Configure to find libraries. Its value +: is prepended to libpth. This variable takes care of special +: machines, like the mips. Usually, it should be empty. +plibpth='' + : Find the basic shell for Bourne shell scripts case "$sh" in '') @@ -383,10 +425,13 @@ done for xxx in $try; do if test -f "$xxx"; then - sh="$xxx"; + sh="$xxx" break + elif test -f "$xxx$_exe"; then + sh="$xxx" + break elif test -f "$xxx.exe"; then - sh="$xxx"; + sh="$xxx" break fi done @@ -395,7 +440,7 @@ esac case "$sh" in -'') cat <<EOM >&2 +'') cat >&2 <<EOM $me: Fatal Error: I can't find a Bourne Shell anywhere. Usually it's in /bin/sh. How did you even get this far? @@ -424,17 +469,17 @@ exit 1 fi fi - echo "#!$xcat" >try - $eunicefix try - chmod +x try - ./try > today 2>/dev/null + echo "#!$xcat" >sharp + $eunicefix sharp + chmod +x sharp + ./sharp > today 2>/dev/null if test -s today; then sharpbang='#!' else - echo "#! $xcat" > try - $eunicefix try - chmod +x try - ./try > today 2>/dev/null + echo "#! $xcat" > sharp + $eunicefix sharp + chmod +x sharp + ./sharp > today 2>/dev/null if test -s today; then sharpbang='#! ' else @@ -454,33 +499,33 @@ echo "I presume that if # doesn't work, #! won't work either!" sharpbang=': use ' fi -rm -f try today +rm -f sharp today : figure out how to guarantee sh startup case "$startsh" in '') startsh=${sharpbang}${sh} ;; *) esac -cat >try <<EOSS +cat >sharp <<EOSS $startsh set abc test "$?abc" != 1 EOSS -chmod +x try -$eunicefix try -if ./try; then +chmod +x sharp +$eunicefix sharp +if ./sharp; then : echo "Yup, it does." else echo "Hmm... '$startsh' does not guarantee sh startup..." echo "You may have to fix up the shell scripts to make sure $sh runs them." fi -rm -f try +rm -f sharp : Save command line options in file UU/cmdline.opt for later use in : generating config.sh. cat > cmdline.opt <<EOSH -# Configure command line arguments. +: Configure command line arguments. config_arg0='$0' config_args='$*' config_argc=$# @@ -492,7 +537,6 @@ cat >>cmdline.opt <<EOSH config_arg$argn='$arg' EOSH - # Extreme backslashitis: replace each ' by '"'"' cat <<EOC | sed -e "s/'/'"'"'"'"'"'"'/g" > cmdl.opt $arg EOC @@ -501,8 +545,6 @@ argn=`expr $argn + 1` args_sep=' ' done -# args_exp is good for restarting self: eval "set X $args_exp"; shift; $0 "$@" -# used by ./hints/os2.sh rm -f cmdl.opt : produce awk script to parse command line options @@ -672,7 +714,7 @@ esac shift ;; - -V) echo "$me generated by metaconfig 3.0 PL70." >&2 + -V) echo "$me generated by metaconfig 3.5 PL0." >&2 exit 0;; --) break;; -*) echo "$me: unknown option $1" >&2; shift; error=true;; @@ -745,7 +787,7 @@ touch posthint.sh : set package name -package=dist +package='dist' first=`echo $package | sed -e 's/^\(.\).*/\1/'` last=`echo $package | sed -e 's/^.\(.*\)/\1/'` case "`echo AbyZ | tr '[:lower:]' '[:upper:]' 2>/dev/null`" in @@ -753,6 +795,29 @@ *) spackage=`echo $first | tr '[a-z]' '[A-Z]'`$last;; esac +: script used to emulate mkdir -p +cat >mkdirp <<EOS +$startsh +EOS +cat >>mkdirp <<'EOS' +name=$1; +create=""; +while test $name; do + if test ! -d "$name"; then + create="$name $create" + name=`echo $name | sed -e "s|^[^/]*$||"` + name=`echo $name | sed -e "s|\(.*\)/.*|\1|"` + else + name="" + fi +done +for file in $create; do + mkdir $file +done +EOS +chmod +x mkdirp +$eunicefix mkdirp + : Some greps do not return status, grrr. echo "grimblepritz" >grimble if grep blurfldyick grimble >/dev/null 2>&1 ; then @@ -777,19 +842,21 @@ : Find the path to the source tree case "$src" in '') case "$0" in - */*) src=`echo $0 | sed -e 's%/[^/][^/]*$%%'`;; - *) src='.';; + */*) + src=`echo $0 | sed -e 's%/[^/][^/]*$%%'` + ;; + *) src='.';; esac;; esac case "$src" in '') src=/ rsrc=/ ;; -/*) rsrc="$src";; -*) rsrc="../$src";; +/*) rsrc="$src";; +*) rsrc="../$src";; esac if test -f $rsrc/Configure && \ - $contains "^package=$package$" $rsrc/Configure >/dev/null 2>&1 + $contains "^package='$package'\$" $rsrc/Configure >/dev/null 2>&1 then : found it, so we are ok. else @@ -840,22 +907,6 @@ if test ! -f "$SRC/$1"; then shift fi -mkdir_p=' -name=$1; -create=""; -while test $name; do - if test ! -d "$name"; then - create="$name $create"; - name=`echo $name | sed -e "s|^[^/]*$||"`; - name=`echo $name | sed -e "s|\(.*\)/.*|\1|"`; - else - name=""; - fi; -done; -for file in $create; do - mkdir $file; -done -' for file in $*; do case "$SRC" in ".") @@ -875,7 +926,7 @@ */*) dir=`expr X$file : 'X\(.*\)/'` file=`expr X$file : 'X.*/\(.*\)'` - (set x $dir; shift; eval $mkdir_p) + ./mkdirp $dir sh <"$SRC/$dir/$file" ;; *) @@ -887,8 +938,7 @@ done if test -f "$SRC/config_h.SH"; then if test ! -f config.h; then - : oops, they left it out of MANIFEST, probably, so do it anyway. - . "$SRC/config_h.SH" + sh <"$SRC/config_h.SH" fi fi EOS @@ -1185,7 +1235,7 @@ the questions and use the computed defaults (or the previous answers if there was already a config.sh file). Type 'Configure -h' for a list of options. You may also start interactively and then answer '& -d' at any prompt to turn -on the non-interactive behaviour for the remaining of the execution. +on the non-interactive behaviour for the remainder of the execution. EOH . ./myread @@ -1224,7 +1274,6 @@ else cat >msg fi -echo " " echo "*** WARNING:" >&4 sed -e 's/^/*** /' <msg >&4 echo "*** " >&4 @@ -1302,6 +1351,7 @@ uniq " trylist=" +Mcc cpp date inews @@ -1476,6 +1526,8 @@ *) $rm -f try try.* $cat >try.c <<EOM int main(int argc, char *argv[]) { + (void) argc; + (void) argv; return 0; } EOM @@ -1509,13 +1561,11 @@ fi case "$ans" in [yY]*) cc=gcc; ccname=gcc; ccflags=''; despair=no; - if $test -f usethreads.cbu; then - $cat >&4 <<EOM - -*** However, any setting of the C compiler flags (e.g. for thread support) -*** has been lost. It may be necessary to pass -Dcc=gcc to Configure -*** (together with any other cc-dependent option). - + $cat *.cbu >checktmp 2>/dev/null + if $contains ccflags checktmp >/dev/null; then + ./warn <<EOM +Any previous setting of the C compiler flags has been lost. +It may be necessary to pass -Dcc=gcc to Configure right away. EOM fi;; esac @@ -1537,6 +1587,8 @@ *) $rm -f try try.* $cat >try.c <<EOM int main(int argc, char *argv[]) { + (void) argc; + (void) argv; return 0; } EOM @@ -1562,7 +1614,8 @@ : determine whether symbolic links are supported echo " " $touch blurfl -if $ln -s blurfl sym > /dev/null 2>&1 ; then +$rm -f sym +if $ln -s blurfl sym > /dev/null 2>&1 && $test -f sym; then echo "Symbolic links are supported." >&4 lns="$ln -s" else @@ -1628,9 +1681,16 @@ ;; esac +: define absolute package source directory +case "$src" in +/*) pkgsrc=$src;; +*) pkgsrc=`cd $rsrc; pwd`;; +esac + : Duplicate the tree with symbolic links if -Dmksymlinks was supplied case "$mksymlinks" in $define|true|[yY]*) + echo " " case "$src" in ''|'.') echo "Cannot create symlinks in the original directory." >&4 exit 1 @@ -1643,16 +1703,17 @@ awk '{print $1}' $src/MANIFEST | grep / | sed 's:/[^/]*$::' | \ sort -u | while true do - read directory - test -z "$directory" && break - if mkdir -p $directory 2>/dev/null && test -d $directory; then + read dir + test -z "$dir" && break + ./UU/mkdirp $dir 2>/dev/null + if test -d $dir; then : ok else - echo "Failed to create '$directory'. Aborting." >&4 + echo "Failed to create '$dir'. Aborting." >&4 exit 1 fi done - echo "(Then creating the symlinks...)" >&4 + echo "(Now creating the symlinks...)" >&4 awk '{print $1}' $src/MANIFEST | while true; do read filename test -z "$filename" && break @@ -1664,7 +1725,7 @@ if test -f $filename; then echo "$filename already exists, not symlinking." else - ln -s $src/$filename $filename + ln -s $pkgsrc/$filename $filename fi done echo "(Checking current directory...)" >&4 @@ -1678,7 +1739,6 @@ >/dev/null 2>>"$tmppwd/missing") done if test -s missing; then - cat missing >&4 echo "Failed duplication of source tree. Aborting." >&4 exit 1 fi @@ -1691,22 +1751,9 @@ ;; esac -: setup for possible cross-compilation -run='' -to=: -from=: -usecrosscompile='undef' -targetarch='' -case "$usecrosscompile" in -$define|true|[yY]*) - echo "Cross-compilation is not supported for this package." >&4 - exit 1 - ;; -esac - : see whether [:lower:] and [:upper:] are supported character classes echo " " -case "`echo AbyZ | $tr '[:lower:]' '[:upper:]' 2>/dev/null`" in +case "`echo AbyZ | LC_ALL=C $tr '[:lower:]' '[:upper:]' 2>/dev/null`" in ABYZ) echo "Good, your tr supports [:lower:] and [:upper:] to convert case." >&4 up='[:upper:]' @@ -1715,14 +1762,14 @@ *) # There is a discontinuity in EBCDIC between 'I' and 'J' # (0xc9 and 0xd1), therefore that is a nice testing point. if test "X$up" = X -o "X$low" = X; then - case "`echo IJ | $tr '[I-J]' '[i-j]' 2>/dev/null`" in + case "`echo IJ | LC_ALL=C $tr '[I-J]' '[i-j]' 2>/dev/null`" in ij) up='[A-Z]' low='[a-z]' ;; esac fi if test "X$up" = X -o "X$low" = X; then - case "`echo IJ | $tr I-J i-j 2>/dev/null`" in + case "`echo IJ | LC_ALL=C $tr I-J i-j 2>/dev/null`" in ij) up='A-Z' low='a-z' ;; @@ -1733,14 +1780,15 @@ *C9D1*|*c9d1*) echo "Hey, this might be EBCDIC." >&4 if test "X$up" = X -o "X$low" = X; then - case "`echo IJ | $tr '[A-IJ-RS-Z]' '[a-ij-rs-z]' 2>/dev/null`" in + case "`echo IJ | \ + LC_ALL=C $tr '[A-IJ-RS-Z]' '[a-ij-rs-z]' 2>/dev/null`" in ij) up='[A-IJ-RS-Z]' low='[a-ij-rs-z]' ;; esac fi if test "X$up" = X -o "X$low" = X; then - case "`echo IJ | $tr A-IJ-RS-Z a-ij-rs-z 2>/dev/null`" in + case "`echo IJ | LC_ALL=C $tr A-IJ-RS-Z a-ij-rs-z 2>/dev/null`" in ij) up='A-IJ-RS-Z' low='a-ij-rs-z' ;; @@ -1750,7 +1798,7 @@ esac fi esac -case "`echo IJ | $tr \"$up\" \"$low\" 2>/dev/null`" in +case "`echo IJ | LC_ALL=C $tr \"$up\" \"$low\" 2>/dev/null`" in ij) echo "Using $up and $low to convert case." >&4 ;; @@ -1764,28 +1812,309 @@ cat >tr <<EOSC $startsh case "\$1\$2" in -'[A-Z][a-z]') exec $tr '$up' '$low';; -'[a-z][A-Z]') exec $tr '$low' '$up';; +'[A-Z][a-z]') LC_ALL=C exec $tr '$up' '$low';; +'[a-z][A-Z]') LC_ALL=C exec $tr '$low' '$up';; esac -exec $tr "\$@" +LC_ALL=C exec $tr "\$@" EOSC chmod +x tr $eunicefix tr -: Try to determine whether config.sh was made on this system -case "$config_sh" in -'') +: setup for possible cross-compilation +run='' +to=: +from=: +usecrosscompile='undef' +targetarch='' +case "$usecrosscompile" in +$define|true|[yY]*) + echo "Cross-compilation is not supported for this package." >&4 + exit 1 + ;; +esac + +: Determine the name of the machine myuname=`$uname -a 2>/dev/null` $test -z "$myuname" && myuname=`hostname 2>/dev/null` myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e 's/\///g' | \ ./tr '[A-Z]' '[a-z]' | $tr $trnl ' '` newmyuname="$myuname" +$test -f "$uname$_exe" && has_uname=y + +: Guessing of the OS name -- half the following guesses are probably wrong... +: If you have better tests or hints, please send them to the metaconfig +: authors and to Rap...@gr... +$test -f /irix && osname=irix +$test -f /xenix && osname=sco_xenix +$test -f /dynix && osname=dynix +$test -f /dnix && osname=dnix +$test -f /lynx.os && osname=lynxos +$test -f /unicos && osname=unicos && osvers=`$uname -r` +$test -f /unicosmk && osname=unicosmk && osvers=`$uname -r` +$test -f /unicosmk.ar && osname=unicosmk && osvers=`$uname -r` +$test -f /bin/mips && /bin/mips && osname=mips +$test -d /NextApps && set X `hostinfo | $grep 'NeXT Mach.*:' | \ + $sed -e 's/://' -e 's/\./_/'` && osname=next && osvers=$4 +$test -d /usr/apollo/bin && osname=apollo +$test -f /etc/saf/_sactab && osname=svr4 +$test -d /usr/include/minix && osname=minix +$test -f /system/gnu_library/bin/ar.pm && osname=vos +if $test -d /MachTen -o -d /MachTen_Folder; then + osname=machten + if $test -x /sbin/version; then + osvers=`/sbin/version | $awk '{print $2}' | + $sed -e 's/[A-Za-z]$//'` + elif $test -x /usr/etc/version; then + osvers=`/usr/etc/version | $awk '{print $2}' | + $sed -e 's/[A-Za-z]$//'` + else + osvers="$2.$3" + fi +fi +$test -f /sys/posix.dll && + $test -f /usr/bin/what && + set X `/usr/bin/what /sys/posix.dll` && + $test "$3" = UWIN && + osname=uwin && + osvers="$5" +if $test "X$has_uname" != X; then + set X $myuname + shift + case "$5" in + fps*) osname=fps ;; + mips*) + case "$4" in + umips) osname=umips ;; + *) osname=mips ;; + esac;; + [23]100) osname=mips ;; + next*) osname=next ;; + i386*) + tmp=`/bin/uname -X 2>/dev/null|awk '/3\.2v[45]/{ print $(NF) }'` + if $test "$tmp" != "" -a "$3" = "3.2" -a -f '/etc/systemid'; then + osname='sco' + osvers=$tmp + elif $test -f /etc/kconfig; then + osname=isc + if $test "$lns" = "$ln -s"; then + osvers=4 + elif $contains _SYSV3 /usr/include/stdio.h > /dev/null 2>&1 ; then + osvers=3 + elif $contains _POSIX_SOURCE /usr/include/stdio.h > /dev/null 2>&1 ; then + osvers=2 + fi + fi + tmp='' + ;; + pc*) + if $test -n "$DJGPP"; then + osname=dos + osvers=djgpp + fi + ;; + esac + case "$1" in + aix) osname=aix + tmp=`( (oslevel) 2>/dev/null || echo "not found") 2>&1` + case "$tmp" in + 'not found') osvers="$4"."$3" ;; + '<3240'|'<>3240') osvers=3.2.0 ;; + '=3240'|'>3240'|'<3250'|'<>3250') osvers=3.2.4 ;; + '=3250'|'>3250') osvers=3.2.5 ;; + *) osvers=$tmp;; + esac + ;; + bsd386) osname=bsd386 + osvers=`$uname -r` + ;; + cygwin*) osname=cygwin + osvers="$3" + ;; + *dc.osx) osname=dcosx + osvers="$3" + ;; + dnix) osname=dnix + osvers="$3" + ;; + domainos) osname=apollo + osvers="$3" + ;; + dgux) osname=dgux + osvers="$3" + ;; + dynixptx*) osname=dynixptx + osvers=`echo "$4"|sed 's/^v//'` + ;; + freebsd) osname=freebsd + osvers="$3" ;; + genix) osname=genix ;; + hp*) osname=hpux + osvers=`echo "$3" | $sed 's,.*\.\([0-9]*\.[0-9]*\),\1,'` + ;; + irix*) osname=irix + case "$3" in + 4*) osvers=4 ;; + 5*) osvers=5 ;; + *) osvers="$3" ;; + esac + ;; + linux) osname=linux + case "$3" in + *) osvers="$3" ;; + esac + ;; + MiNT) osname=mint + ;; + netbsd*) osname=netbsd + osvers="$3" + ;; + news-os) osvers="$3" + case "$3" in + 4*) osname=newsos4 ;; + *) osname=newsos ;; + esac + ;; + next*) osname=next ;; + nonstop-ux) osname=nonstopux ;; + openbsd) osname=openbsd + osvers="$3" + ;; + POSIX-BC | posix-bc ) osname=posix-bc + osvers="$3" + ;; + powerux | power_ux | powermax_os | powermaxos | \ + powerunix | power_unix) osname=powerux + osvers="$3" + ;; + qnx) osname=qnx + osvers="$4" + ;; + solaris) osname=solaris + case "$3" in + 5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;; + *) osvers="$3" ;; + esac + ;; + sunos) osname=sunos + case "$3" in + 5*) osname=solaris + osvers=`echo $3 | $sed 's/^5/2/g'` ;; + *) osvers="$3" ;; + esac + ;; + titanos) osname=titanos + case "$3" in + 1*) osvers=1 ;; + 2*) osvers=2 ;; + 3*) osvers=3 ;; + 4*) osvers=4 ;; + *) osvers="$3" ;; + esac + ;; + ultrix) osname=ultrix + osvers="$3" + ;; + osf1|mls+) case "$5" in + alpha) + osname=dec_osf + osvers=`sizer -v | awk '{print $3}' | \ + ./tr '[A-Z]' '[a-z]' | sed 's/^[xvt]//'` + case "$osvers" in + [1-9].[0-9]*) ;; + *) osvers=`echo "$3" | sed 's/^[xvt]//'` ;; + esac + ;; + hp*) osname=hp_osf1 ;; + mips) osname=mips_osf1 ;; + esac + ;; + unixware) osname=svr5 + osvers="$4" + ;; + uts) osname=uts + osvers="$3" + ;; + vos) osvers="$3" + ;; + $2) case "$osname" in + *isc*) ;; + *freebsd*) ;; + svr*) + : svr4.x or possibly later + case "svr$3" in + ${osname}*) + osname=svr$3 + osvers=$4 + ;; + esac + case "$osname" in + svr4.0) + : Check for ESIX + if $test -f /stand/boot ; then + eval `$grep '^INITPROG=[a-z/0-9]*$' /stand/boot` + if $test -n "$INITPROG" -a -f "$INITPROG"; then + isesix=`strings -a $INITPROG | \ + $grep 'ESIX SYSTEM V/386 Release 4.0'` + if $test -n "$isesix"; then + osname=esix4 + fi + fi + fi + ;; + esac + ;; + *) if $test -f /etc/systemid; then + osname=sco + set `echo $3 | $sed 's/\./ /g'` $4 + if $test -f $src/hints/sco_$1_$2_$3.sh; then + osvers=$1.$2.$3 + elif $test -f $src/hints/sco_$1_$2.sh; then + osvers=$1.$2 + elif $test -f $src/hints/sco_$1.sh; then + osvers=$1 + fi + else + case "$osname" in + '') : Still unknown. Probably a generic Sys V. + osname="sysv" + osvers="$3" + ;; + esac + fi + ;; + esac + ;; + *) case "$osname" in + '') : Still unknown. Probably a generic BSD. + osname="$1" + osvers="$3" + ;; + esac + ;; + esac +else + if $test -f /vmunix -a -f $src/hints/news_os.sh; then + (what /vmunix | UU/tr '[A-Z]' '[a-z]') > UU/kernel.what 2>&1 + if $contains news-os UU/kernel.what >/dev/null 2>&1; then + osname=news_os + fi + $rm -f UU/kernel.what + elif $test -d c:/.; then + set X $myuname + osname=os2 + osvers="$5" + fi +fi + +: Try to determine whether config.sh was made on this system +case "$config_sh" in +'') dflt=n case "$knowitall" in '') if test -f ../config.sh; then if $contains myuname= ../config.sh >/dev/null 2>&1; then - eval "`grep myuname= ../config.sh`" + eval "`$grep myuname= ../config.sh`" fi if test "X$myuname" = "X$newmyuname"; then dflt=y @@ -1795,18 +2124,21 @@ *) dflt=y;; esac -: Get old answers, if there is a config file out there +: Get old answers from config file if it was generated on the same system hint=default -hintfile='' -if test -f ../config.sh; then +if $test -f ../config.sh; then echo " " rp="I see a config.sh file. Shall I use it to set the defaults?" . ./myread case "$ans" in - n*|N*) echo "OK, I'll ignore it.";; + n*|N*) echo "OK, I'll ignore it." + mv ../config.sh ../config.sh.old + myuname="$newmyuname" + ;; *) echo "Fetching default answers from your old config.sh file..." >&4 tmp_n="$n" tmp_c="$c" + tmp_sh="$sh" . ../config.sh cp ../config.sh . n="$tmp_n" @@ -1821,6 +2153,7 @@ echo "Fetching default answers from $config_sh..." >&4 tmp_n="$n" tmp_c="$c" + tmp_sh="$sh" cd .. cp $config_sh config.sh 2>/dev/null chmod +w config.sh @@ -1832,19 +2165,76 @@ hint=previous ;; esac -test "$override" && . ./optdef.sh +case "$sh" in +'') sh="$tmp_sh" ;; +esac +$test "$override" && . ./optdef.sh : Restore computed paths for file in $loclist $trylist; do eval $file="\$_$file" done -: process their -A options +. ./checkcc +case "$targetarch" in +'') ;; +*) hostarch=$osname + osname=`echo $targetarch|sed 's,^[^-]*-,,'` + osvers='' + ;; +esac + +: Process their -A options . ./posthint.sh +: Ask them to confirm the OS name +cat << EOM + +Configure uses the operating system name and version to set some defaults. +The default value is probably right if the name rings a bell. Otherwise, +since spelling matters for me, either accept the default or answer "none" +to leave it blank. + +EOM +case "$osname" in + ''|' ') + case "$hintfile" in + ''|' '|none) dflt=none ;; + *) dflt=`echo $hintfile | $sed -e 's/\.sh$//' -e 's/_.*$//'` ;; + esac + ;; + *) dflt="$osname" ;; +esac +rp="Operating system name?" +. ./myread +case "$ans" in +none) osname='' ;; +*) osname=`echo "$ans" | $sed -e 's/[ ][ ]*/_/g' | ./tr '[A-Z]' '[a-z]'`;; +esac +echo " " +case "$osvers" in + ''|' ') + case "$hintfile" in + ''|' '|none) dflt=none ;; + *) dflt=`echo $hintfile | $sed -e 's/\.sh$//' -e 's/^[^_]*//'` + dflt=`echo $dflt | $sed -e 's/^_//' -e 's/_/./g'` + case "$dflt" in + ''|' ') dflt=none ;; + esac + ;; + esac + ;; + *) dflt="$osvers" ;; +esac +rp="Operating system version?" +. ./myread +case "$ans" in +none) osvers='' ;; +*) osvers="$ans" ;; +esac + : who configured the system -LC_ALL=C; export LC_ALL -cf_time=`$date 2>&1` +cf_time=`LC_ALL=C; LANGUAGE=C; export LC_ALL; export LANGUAGE; $date 2>&1` cf_by=`(logname) 2>/dev/null` case "$cf_by" in "") @@ -1854,12 +2244,18 @@ esac ;; esac +: allow them to override the AFS root +case "$afsroot" in +'') afsroot=/afs ;; +*) afsroot=$afsroot ;; +esac + : is AFS running? echo " " case "$afs" in $define|true) afs=true ;; $undef|false) afs=false ;; -*) if test -d /afs; then +*) if $test -d $afsroot; then afs=true else afs=false @@ -1876,7 +2272,8 @@ echo " " case "$sysman" in '') - syspath='/usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1' + syspath='/usr/share/man/man1 /usr/man/man1' + syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" syspath="$syspath /usr/man/u_man/man1 /usr/share/man/man1" syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" @@ -1969,10 +2366,15 @@ nopath_ok='' orig_rp="$rp" orig_dflt="$dflt" +case "$gfpth" in +'') gfpth='.' ;; +esac case "$fn" in *\(*) - expr $fn : '.*(\(.*\)).*' | tr ',' '\012' >getfile.ok + : getfile will accept an answer from the comma-separated list + : enclosed in parentheses even if it does not meet other criteria. + expr "$fn" : '.*(\(.*\)).*' | $tr ',' $trnl >getfile.ok fn=`echo $fn | sed 's/(.*)//'` ;; esac @@ -2071,6 +2473,7 @@ true) case "$ansexp" in /*) value="$ansexp" ;; + [a-zA-Z]:/*) value="$ansexp" ;; *) redo=true case "$already" in @@ -2095,18 +2498,40 @@ '') case "$type" in File) - if test -f "$ansexp"; then - type='' - elif test -r "$ansexp" || (test -h "$ansexp") >/dev/null 2>&1 - then - echo "($value is not a plain file, but that's ok.)" - type='' - fi + for fp in $gfpth; do + if test "X$fp" = X.; then + pf="$ansexp" + else + pf="$fp/$ansexp" + fi + if test -f "$pf"; then + type='' + elif test -r "$pf" || (test -h "$pf") >/dev/null 2>&1 + then + echo "($value is not a plain file, but that's ok.)" + type='' + fi + if test X"$type" = X; then + value="$pf" + break + fi + done ;; Directory) - if test -d "$ansexp"; then - type='' - fi + for fp in $gfpth; do + if test "X$fp" = X.; then + dir="$ans" + direxp="$ansexp" + else + dir="$fp/$ansexp" + direxp="$fp/$ansexp" + fi + if test -d "$direxp"; then + type='' + value="$dir" + break + fi + done ;; Locate) if test -d "$ansexp"; then @@ -2160,6 +2585,7 @@ rp="$orig_rp" dflt="$orig_dflt" rm -f getfile.ok +test "X$gfpthkeep" != Xy && gfpth="" EOSC : determine root of directory hierarchy where package will be installed. @@ -2406,7 +2832,6 @@ : preserve RCS keywords in files with variable substitution, grrr Header='$Header' Id='$Id' -Locker='$Locker' Log='$Log' : Define several unixisms. @@ -2434,8 +2859,11 @@ echo exit 1 >os2 echo exit 1 >gnu echo exit 1 >linux +echo exit 1 >dos d_bsd="$undef" d_linux="$undef" +d_dos="$undef" +d_os2="$undef" $cat /usr/include/signal.h /usr/include/sys/signal.h >foo 2>/dev/null if test -f /osf_boot || $contains 'OSF/1' /usr/include/ctype.h >/dev/null 2>&1 then @@ -2495,9 +2923,21 @@ *) $cat <<'EOI' I have the feeling something is not exactly right, however...don't tell me... +EOI + if test -n "$DJGPP"; then + case "X${MACHTYPE:-nonesuchmach}" in + cygwin) echo "hah!... you're running under Cygwin!";; + *) echo "got it... you're running DOS with DJGPP!";; + esac + echo exit 0 >dos + d_dos="$define" + else + $cat <<'EOI' lemme think...does HAL ring a bell?...no, of course, you're only running OS/2! EOI - echo exit 0 >os2 + echo exit 0 >os2 + d_os2="$define" + fi ;; esac if test -f /xenix; then @@ -2522,12 +2962,58 @@ echo "Nor is it Venix..." fi fi -chmod +x bsd usg v7 osf1 eunice xenix venix os2 gnu linux -$eunicefix bsd usg v7 osf1 eunice xenix venix os2 gnu linux +chmod +x bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux +$eunicefix bsd usg v7 osf1 eunice xenix venix dos os2 gnu linux $rm -f foo +: What should the include directory be ? +echo " " +$echo $n "Hmm... $c" +dflt='/usr/include' +incpath='' +mips_type='' +if $test -f /bin/mips && /bin/mips; then + echo "Looks like a MIPS system..." + $cat >usr.c <<'EOCP' +#ifdef SYSTYPE_BSD43 +/bsd43 +#endif +EOCP + if cc -E usr.c > usr.out && $contains / usr.out >/dev/null 2>&1; then + dflt='/bsd43/usr/include' + incpath='/bsd43' + mips_type='BSD 4.3' + else + mips_type='System V' + fi + $rm -f usr.c usr.out + echo "and you're compiling with the $mips_type compiler and libraries." + xxx_prompt=y + echo "exit 0" >mips +else + echo "Doesn't look like a MIPS system." + xxx_prompt=n + echo "exit 1" >mips +fi +chmod +x mips +$eunicefix mips +case "$usrinc" in +'') ;; +*) dflt="$usrinc";; +esac +case "$xxx_prompt" in +y) fn=d/ + echo " " + rp='Where are the include files you want to use?' + . ./getfile + usrinc="$ans" + ;; +*) usrinc="$dflt" + ;; +esac + : see if we have to deal with yellow pages, now NIS. -if $test -d /usr/etc/yp || $test -d /etc/yp; then +if $test -d /usr/etc/yp || $test -d /etc/yp || $test -d /usr/lib/yp; then if $test -f /usr/etc/nibindd; then echo " " echo "I'm fairly confident you're on a NeXT." @@ -2571,13 +3057,16 @@ esac fi case "$hostcat" in -'') hostcat='cat /etc/hosts';; +'') hostcat=':' + $test -f /etc/hosts && hostcat='cat /etc/hosts';; esac case "$groupcat" in -'') groupcat='cat /etc/group';; +'') groupcat=':' + $test -f /etc/group && groupcat='cat /etc/group';; esac case "$passcat" in -'') passcat='cat /etc/passwd';; +'') passcat=':' + $test -f /etc/passwd && passcat='cat /etc/passwd';; esac : now get the host name @@ -2634,6 +3123,9 @@ fi fi fi +case "$myhostname" in +'') myhostname=noname ;; +esac : you do not want to know about this set $myhostname myhostname=$1 @@ -2685,14 +3177,20 @@ tmp_re="[ . ]" $test x`$awk "/[0-9].*[ ]$myhostname$tmp_re/ { sum++ } END { print sum }" hosts` = x1 || tmp_re="[ ]" - dflt=.`$awk "/[0-9].*[ ]$myhostname$tmp_re/ {for(i=2; i<=NF;i++) print \\\$i}" \ + dflt=.`$awk \ + "/[0-9].*[ ]$myhostname$tmp_re/ {for(i=2; i<=NF;i++) print \\\$i}" \ hosts | $sort | $uniq | \ $sed -n -e "s/$myhostname\.\([-a-zA-Z0-9_.]\)/\1/p"` case `$echo X$dflt` in X*\ *) echo "(Several hosts in /etc/hosts matched hostname)" dflt=. ;; - X.) echo "(You do not have fully-qualified names in /etc/hosts)" + X.) + if $test -f /etc/hosts; then + echo "(You do not have fully-qualified names in /etc/hosts)" + else + echo "(I cannot locate a hosts database anywhere)" + fi ;; esac case "$dflt" in @@ -2721,9 +3219,16 @@ esac ;; esac + case "$dflt$osname" in + .os390) + file="//'SYS1.TCPPARMS(TCPDATA)'" + echo "(Attempting domain name extraction from $file)" + dflt=.`awk '/^DOMAINORIGIN/ {print $2}' "$file" 2>/dev/null` + ;; + esac case "$dflt" in .) echo "(Lost all hope -- silly guess then)" - dflt='.uucp' + dflt='.nonet' ;; esac $rm -f hosts @@ -2776,7 +3281,7 @@ I need to get your e-mail address in Internet format if possible, i.e. something like us...@ho...main. Please answer accurately since I have no easy means to double check it. The default value provided below -is most probably close to the reality but may not be valid from outside +is most probably close to reality but may not be valid from outside your organization... EOM @@ -2827,177 +3332,93 @@ fi $rm -f foo.c foo.cpp -: determine default editor +: Check whether they have gcc in any guise. echo " " -case "$defeditor" in -'') - case "$vi" in - */*) dflt="$vi";; - *) dflt=/usr/ucb/vi;; - esac - ;; -*) dflt="$defeditor" - ;; -esac -fn=f/ -rp="What is the default editor on your system?" -. ./getfile -defeditor="$ans" - -: locate a BSD compatible install program -echo " " -echo "Looking for a BSD-compatible install program..." >&4 -creatdir='' -case "$install" in -'') - tryit='' - for dir in $pth; do - for file in ginstall installbsd scoinst install; do - if $test -f $dir/$file; then - tryit="$tryit $dir/$file" - fi - done - done - $cat >try.c <<EOC -int main() -{ - printf("OK\n"); +echo "Checking for GNU cc in disguise and/or its version number..." >&4 +$cat >try.c <<EOM +#include <stdio.h> +int main() { +#ifdef __GNUC__ +#ifdef __VERSION__ + printf("%s\n", __VERSION__); +#else + printf("%s\n", "1"); +#endif +#endif exit(0); } -EOC - if $cc -o try try.c >/dev/null 2>&1; then - cp try try.ns - strip try >/dev/null 2>&1 - else - echo "(I can't seem to compile a trivial C program -- bypassing.)" - echo "try" >try - cp try try.ns - fi - $cat >tryinst <<EOS -$startsh -$rm -rf foo d -\$1 -d foo/bar -$mkdir d -\$1 -c -m 764 try.ns d -\$1 -c -s -m 642 try.ns d/try -EOS - chmod +x tryinst - $eunicefix tryinst - dflt='' - either='' - for prog in $tryit; do - $echo $n "Checking $prog... $c" - ./tryinst $prog >/dev/null 2>&1 - if $test -d foo/bar; then - creatdir="$prog -d" - fi - (ls -l d/try >try.ls; ls -l d/try.ns >tryno.ls) 2>/dev/null - if (cmp -s d/try try && cmp -s d/try.ns try.ns && \ - $contains 'rwxrw-r--' tryno.ls && \ - $contains 'rw-r---w-' try.ls) >/dev/null 2>&1 - then - dflt="$prog" - echo "ok, that will do." - break - fi - echo "not good$either." - either=' either' - $rm -f try*.ls - done - $rm -rf foo d tryinst try try*.ls try.* - case "$dflt" in +EOM +if $cc -o try $ccflags $ldflags try.c >/dev/null 2>&1; then + gccversion=`$run ./try` + case "$gccversion" in + '') echo "You are not using GNU cc." ;; + *) echo "You are using GNU cc $gccversion." + ccname=gcc + ;; + esac +else + echo " " + echo "*** WHOA THERE!!! ***" >&4 + echo " Your C compiler \"$cc\" doesn't seem to be working!" >&4 + case "$knowitall" in '') - echo "Hopefully, $package comes with its own install script!" - dflt='./install' + echo " You'd better start hunting for one and let me know about it." >&4 + exit 1 ;; esac - ;; -*) dflt="$install";; +fi +$rm -f try try.* +case "$gccversion" in +1*) cpp=`./loc gcc-cpp $cpp $pth` ;; esac -$cat <<EOM +case "$gccversion" in +'') gccosandvers='' ;; +*) gccshortvers=`echo "$gccversion"|sed 's/ .*//'` + gccosandvers=`$cc -v 2>&1 | \ + $grep '/specs$'|sed "s!.*/[^-/]*-[^-/]*-\([^-/]*\)/$gccshortvers/specs!\1!"` + gccshortvers='' + case "$gccosandvers" in + $osname) gccosandvers='' ;; # linux gccs seem to have no linux osvers, grr + $osname$osvers) ;; # looking good + $osname*) cat <<EOM >&4 -I will be requiring a BSD-compatible install program (one that allows -options like -s to strip executables or -m to specify a file mode) to -install $package. +*** WHOA THERE!!! *** -If the question below contains a fully qualified default path, then it -is probably ok. If it is an unqualified name such as 'install', then it -means I was unable to find out a good install program I could use. If -you know of one, please tell me about it. If the default is './install', -then I shall be using the install script supplied with $package. + Your gcc has not been compiled for the exact release of + your operating system ($gccosandvers versus $osname$osvers). + In general it is a good idea to keep gcc synchronized with + the operating system because otherwise serious problems + may ensue when trying to compile software, like Perl. + + I'm trying to be optimistic here, though, and will continue. + If later during the configuration and build icky compilation + problems appear (headerfile conflicts being the most common + manifestation), I suggest reinstalling the gcc to match + your operating system release. + EOM -fn='/fe~(install,./install)' -rp='Which install program shall I use?' -. ./getfile -install="$ans" - -: how can we create nested directories? -echo " " -echo "Ok, let's see how we can create nested directories..." >&4 -case "$installdir" in -'') - case "$creatdir" in - '') - $mkdir -p foo/bar >/dev/null 2>&1 - if $test -d foo/bar; then - echo "Great, we can build them using 'mkdir -p'." - creatdir='mkdir -p' - elif eval "$install -d foo/bar"; $test -d foo/bar; then - creatdir="install -d" - echo "It looks like '$creatdir' will do it for us." - fi - ;; - *) - eval "$creatdir foo/bar" >/dev/null 2>&1 - if $test -d foo/bar; then - echo "Ah! We can use '$creatdir' to do just that." - fi - ;; - esac - $rm -rf foo - case "$creatdir" in - '') - echo "Heck! Another ancient system lacking the comfort of modern ones!" - echo "You can thank $package for bringing you its own install script!" - installdir='./install -d' - ;; - *) installdir="$creatdir";; - esac - ;; -*) echo "As you already told me, '$installdir' should work.";; + ;; + *) gccosandvers='' ;; # failed to parse, better be silent + esac + ;; esac +case "$ccname" in +'') ccname="$cc" ;; +esac -: determine the name of a reasonable mailer -case "$mailer" in -'') - if $test -f "$sendmail"; then - dflt="$sendmail" - elif $test -f "$smail"; then - dflt="$smail" - elif $test -f "$rmail"; then - dflt="$rmail" - elif $test -f /bin/mail; then - dflt=/bin/mail - else - dflt=$mail - fi - ;; -*) dflt="$mailer";; +: gcc 3.1 complains about adding -Idirectories that it already knows about, +: so we will take those off from locincpth. +case "$gccversion" in +3*) + echo "main(){}">try.c + for incdir in `$cc -v -c try.c 2>&1 | \ + sed '1,/^#include <\.\.\.>/d;/^End of search list/,$d;s/^ //'` ; do + locincpth=`echo $locincpth | sed s!$incdir!!` + done + $rm -f try try.* esac -$cat <<EOM -I need the full pathname of the program used to deliver mail on your system. -A typical answer would be /usr/lib/sendmail or /bin/rmail, but you may choose -any other program, as long as it can be fed from standard input and will -honour any user-supplied headers. - -EOM -fn=f -rp='Mail transport agent to be used?' -. ./getfile -mailer="$ans" - : see how we invoke the C preprocessor echo " " echo "Now, how can we feed standard input to your C preprocessor..." >&4 @@ -3007,8 +3428,20 @@ ABC.XYZ EOT cd .. -echo 'cat >.$$.c; '"$cc"' -E ${1+"$@"} .$$.c; rm .$$.c' >cppstdin +if $test ! -f cppstdin; then + echo "$startsh" >cppstdin +if $test "X$osname" = "Xaix" -a "X$gccversion" = X; then + echo 'cat >.$$.c; rm -f .$$.u; '"$cc"' ${1+"$@"} -M -c .$$.c 2>/dev/null; \ + test -s .$$.u && \ + awk '"'"'$2 ~ /\.h$/ { print "# 0 \""$2"\"" }'"'"' .$$.u; \ + rm -f .$$.o .$$.u; '"$cc"' -E ${1+"$@"} .$$.c; rm .$$.c' >> cppstdin +else + echo 'cat >.$$.c; '"$cc"' -E ${1+"$@"} .$$.c; rm .$$.c' >>cppstdin +fi; else + echo "Keeping your $hint cppstdin wrapper." +fi chmod 755 cppstdin +$eunicefix cppstdin wrapper=`pwd`/cppstdin ok='false' cd UU @@ -3131,212 +3564,497 @@ esac case "$cppstdin" in -"$wrapper") ;; +"$wrapper"|'cppstdin') ;; *) $rm -f $wrapper;; esac $rm -f testcpp.c testcpp.out -: find out how to generate dependencies -echo " " -echo "Checking how to generate makefile dependencies on your machine..." >&4 -toplev=`cd ..;pwd` -$cat >dep.c <<'EOCP' -#include "dep.h" -EOCP -$cat >dep.h <<'EOCP' +: Set private lib path +case "$plibpth" in +'') if ./mips; then + plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" + fi;; +esac +case "$libpth" in +' ') dlist='';; +'') dlist="$loclibpth $plibpth $glibpth";; +*) dlist="$libpth";; +esac -EOCP -takeflags='flags="" -case "$@" in -*--*) - for arg - do - shift - case "$arg" in - --) break;; - *) flags="$flags $arg";; +: Now check and see which directories actually exist, avoiding duplicates +libpth='' +for xxx in $dlist +do + if $test -d $xxx; then + case " $libpth " in + *" $xxx "*) ;; + *) libpth="$libpth $xxx";; esac - done;; -esac' -case "$mkdep" in -'') + fi +done +$cat <<'EOM' + +Some systems have incompatible or broken versions of libraries. Among +the directories listed in the question below, please remove any you +know not to be holding relevant libraries, and add any that are needed. +Say "none" for none. + +EOM +case "$libpth" in +'') dflt='none';; +*) + set X $libpth + shift + dflt=${1+"$@"} ;; -*) - if test -f "$mkdep" && - $mkdep dep.c >dep.out 2>/dev/null && - $contains "dep$_o:.*dep\.h" dep.out >/dev/null 2>&1 - then - echo "$mkdep works." - else - mkdep= +esac +rp="Directories to use for library searches?" +. ./myread +case "$ans" in +none) libpth=' ';; +*) libpth="$ans";; +esac + +: determine optimize, if desired, or use for debug flag also +case "$optimize" in +' '|$undef) dflt='none';; +'') dflt='-O';; +*) dflt="$optimize";; +esac +$cat <<EOH + +Some C compilers have problems with their optimizers. By default, $package +compiles with the -O flag to use the optimizer. Alternately, you might want +to use the symbolic debugger, which uses the -g flag (on traditional Unix +systems). Either flag can be specified here. To use neither flag, specify +the word "none". + +EOH +rp="What optimizer/debugger flag should be used?" +. ./myread +optimize="$ans" +case "$optimize" in +'none') optimize=" ";; +esac + +dflt='' +: We will not override a previous value, but we might want to +: augment a hint file +case "$hint" in +default|recommended) + case "$gccversion" in + 1*) dflt='-fpcc-struct-return' ;; + esac + case "$gccversion" in + 2*) if test -d /etc/conf/kconfig.d && + $contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1 + then + dflt="$dflt -posix" + fi + ;; + esac + case "$gccversion" in + 1*|2*) dflt="$dflt -Wall";; + *) dflt="$dflt -W -Wall -Wformat=2";; + esac + ;; +esac + +case "$mips_type" in +*BSD*|'') inclwanted="$locincpth $usrinc";; +*) inclwanted="$locincpth $inclwanted $usrinc/bsd";; +esac +for thisincl in $inclwanted; do + if $test -d $thisincl; then + if $test x$thisincl != x$usrinc; then + case "$dflt" in + *$thisincl*);; + *) dflt="$dflt -I$thisincl";; + esac + fi fi +done + +inctest='if $contains $2 $usrinc/$1 >/dev/null 2>&1; then + xxx=true; +elif $contains $2 $usrinc/sys/$1 >/dev/null 2>&1; then + xxx=true; +else + xxx=false; +fi; +if $xxx; then + case "$dflt" in + *$2*);; + *) dflt="$dflt -D$2";; + esac; +fi' + +if ./osf1; then + set signal.h __LANGUAGE_C__; eval $inctest +else + set signal.h LANGUAGE_C; eval $inctest +fi + +case "$hint" in +default|recommended) dflt="$ccflags $dflt" ;; +*) dflt="$ccflags";; esac -case "$mkdep" in -'') - $spitshell > ../mkdep <<EOM -$startsh -$takeflags -for srcfile -do - $cpp -M -I. $cppflags \$flags \$srcfile 2>/dev/null -done -exit 0 +case "$dflt" in +''|' ') dflt=none;; +esac +$cat <<EOH + +Your C compiler may want other flags. For this question you should include +-I/whatever and -DWHATEVER flags and any other flags used by the C compiler, +but you should NOT include libraries or ld flags like -lwhatever. + +To use no flags, specify the word "none". + +EOH +set X $dflt +shift +dflt=${1+"$@"} +rp="Any additional cc flags?" +. ./myread +case "$ans" in +none) ccflags='';; +*) ccflags="$ans";; +esac + +: the following weeds options from ccflags that are of no interest to cpp +cppflags="$ccflags" +case "$gccversion" in +1*) cppflags="$cppflags -D__GNUC__" +esac +case "$mips_type" in +'');; +*BSD*) cppflags="$cppflags -DSYSTYPE_BSD43";; +esac +case "$cppflags" in +'');; +*) + echo " " + echo "Let me guess what the preprocessor flags are..." >&4 + set X $cppflags + shift + cppflags='' + $cat >cpp.c <<'EOM' +#define BLURFL foo + +BLURFL xx LFRULB EOM - mkdep=$toplev/mkdep - chmod +x $mkdep - $eunicefix $mkdep - if $mkdep dep.c >dep.out 2>/dev/null && - $contains "dep$_o:.*dep\.h" dep.out >/dev/null 2>&1 - then - echo "Looks like we can use $cpp -M." - else - mkdep= - fi + previous='' + for flag in $* + do + case "$flag" in + -*) ftry="$flag";; + *) ftry="$previous $flag";; + esac + if $cppstdin -DLFRULB=bar $ftry $cppminus <cpp.c \ + >cpp1.out 2>/dev/null && \ + $cpprun -DLFRULB=bar $ftry $cpplast <cpp.c \ + >cpp2.out 2>/dev/null && \ + $contains 'foo.*xx.*bar' cpp1.out >/dev/null 2>&1 && \ + $contains 'foo.*xx.*bar' cpp2.out >/dev/null 2>&1 + then + cppflags="$cppflags $ftry" + previous='' + else + previous="$flag" + fi + done + set X $cppflags + shift + cppflags=${1+"$@"} + case "$cppflags" in + *-*) echo "They appear to be: $cppflags";; + esac + $rm -f cpp.c cpp?.out ;; esac -case "$mkdep" in -'') - $spitshell > ../mkdep <<EOM -$startsh -$takeflags -for srcfile -do - $cc -MM -I. $cppflags \$flags \$srcfile 2>/dev/null -done -exit 0 -EOM - mkdep=$toplev/mkdep - chmod +x $mkdep - $eunicefix $mkdep - if $mkdep dep.c >dep.out 2>/dev/null && - $contains "dep$_o: dep.h" dep.out >/dev/null 2>&1 - then - echo "Looks like we can use $cc -MM." +: flags used in final linking phase +case "$ldflags" in +'') if ./venix; then + dflt='-i -z' else - mkdep= + dflt='' fi + case "$ccflags" in + *-posix*) dflt="$dflt -posix" ;; + esac ;; +*) dflt="$ldflags";; esac -case "$mkdep" in -'') - $spitshell >../mkdep <<EOS -$startsh -$takeflags -for srcfile -do - case "\$srcfile" in - *.c) c='.c';; - *.y) c='.y';; - *.l) c='.l';; +: Try to guess additional flags to pick up local libraries. +for thislibdir in $libpth; do + case " $loclibpth " in + *" $thislibdir "*) + case "$dflt " in + *"-L$thislibdir "*) ;; + *) dflt="$dflt -L$thislibdir" ;; + esac + ;; esac - filebase=\`basename \$srcfile \$c\` - <\$srcfile $cpp $cppminus $cppflags -I. \$flags 2>/dev/null | \\ - $sed -e '/^# *[0-9]/!d' \\ - -e 's/^.*"\(.*\)".*\$/'\$filebase'$_o: \1/' \\ - -e 's|: \./|: |' \\ - -e 's|: *$|: '\$srcfile'|' | \\ - $grep -v '^#' | $sort | $uniq done -exit 0 -EOS - mkdep=$toplev/mkdep - chmod +x $mkdep - $eunicefix $mkdep - if $mkdep dep.c >dep.out 2>/dev/null && - $contains "dep$_o:.*dep\.h" dep.out >/dev/null 2>&1 - then - echo "A shell script using $cpp does the trick." + +case "$dflt" in +'') dflt='none' ;; +*) set X $dflt; shift; dflt="$@";; +esac + +$cat <<EOH + +Your C linker may need flags. For this question you should +include -L/whatever and any other flags used by the C linker, but you +should NOT include libraries like -lwhatever. + +Make sure you include the appropriate -L/path flags if your C linker +does not normally search all of the directories you specified above, +namely + $libpth +To use no flags, specify the word "none". + +EOH + +rp="Any additional ld flags (NOT including libraries)?" +. ./myread +case "$ans" in +none) ldflags='';; +*) ldflags="$ans";; +esac +rmlist="$rmlist pdp11" + +: coherency check +echo " " +echo "Checking your choice of C compiler and flags for coherency..." >&4 +set X $cc $optimize $ccflags $ldflags -o try try.c +shift +$cat >try.msg <<EOM +I've tried to compile and run a simple program with: + + $* + ./try + +and I got the following output: + +EOM +$cat > try.c <<'EOF' +#include <stdio.h> +int main() { exit(0); } +EOF +dflt=y +if sh -c "$cc $optimize $ccflags $ldflags -o try try.c" >>try.msg 2>&1; then + if sh -c './try' >>try.msg 2>&1; then + dflt=n else - echo "$cpp doesn't seem to be any use at all." - $spitshell >../mkdep <<EOS -$startsh -$takeflags -files="\$@" -set X \$flags -shift -inc='.' -while test \$# -gt 0 -do - case "\$1" in - -I) - shift - inc="\$inc:\$1" + echo "The program compiled OK, but exited with status $?." >>try.msg + rp="You have a problem. Shall I abort Configure" + dflt=y + fi +else + echo "I can't compile the test program." >>try.msg + rp="You have a BIG problem. Shall I abort Configure" + dflt=y +fi +case "$dflt" in +y) + $cat try.msg >&4 + case "$knowitall" in + '') + echo "(The supplied flags might be incorrect with this C compiler.)" ;; - -I*) - dir=\`echo \$1 | sed -e 's/^-I//'\` - inc="\$inc:\$dir" + *) dflt=n;; + esac + echo " " + . ./myread + case "$ans" in + n*|N*) ;; + *) echo "Ok. Stopping Configure." >&4 + exit 1 ;; esac - shift -done -set X \$files -shift -trap "$rm -f /tmp/mkdep\$\$; exit 1" 1 2 3 15 -for srcfile -do - case "\$srcfile" in - *.c) c='.c';; - *.y) c='.y';; - *.l) c='.l';; + ;; +n) echo "OK, that should do.";; +esac +$rm -f try try.* core + +: determine default editor +echo " " +case "$defeditor" in +'') + case "$vi" in + */*) dflt="$vi";; + *) dflt=/usr/ucb/vi;; esac - filebase=\`basename \$srcfile \$c\` - echo \$filebase$_o: \$srcfile - $grep '^#[ ]*include' \$srcfile /dev/null | \ - $sed -n -e 's/#[ ]*include[ ]*//' \\ - -e '/<\(.*\)>/ d' \\ - -e 's/:[^"]*"\([^"]*\)".*/: \1/' \\ - -e "s/\\.c:/$_o:/p" > /tmp/mkdep\$\$ - IFS=': ' - while read file dep; do - for dir in \$inc; do - if $test -f "\$dir/\$dep"; then - dep="\$dir/\$dep" - break + ;; +*) dflt="$defeditor" + ;; +esac +fn=f/ +rp="What is the default editor on your system?" +. ./getfile +defeditor="$ans" + +: locate a BSD compatible install program +echo " " +echo "Looking for a BSD-compatible install program..." >&4 +creatdir='' +case "$install" in +'') + tryit='' + for dir in $pth; do + for file in ginstall installbsd scoinst install; do + if $test -f $dir/$file; then + tryit="$tryit $dir/$file" fi done - echo "\$file: \$dep" | $sed -e 's,: \./,: ,' - done </tmp/mkdep\$\$ - IFS=' ' - $rm -f /tmp/mkdep\$\$ -done -exit 0 + done + $cat >try.c <<EOC +int main() +{ + printf("OK\n"); + exit(0); +} +EOC + if $cc -o try try.c >/dev/null 2>&1; then + cp try try.ns + strip try >/dev/null 2>&1 + else + echo "(I can't seem to compile a trivial C program -- bypassing.)" + echo "try" >try + cp try try.ns + fi + $cat >tryinst <<EOS +$startsh +$rm -rf foo d +\$1 -d foo/bar +$mkdir d +\$1 -c -m 764 try.ns d +\$1 -c -s -m 642 try.ns d/try EOS - mkdep=$toplev/mkdep - chmod +x $mkdep - $eunicefix $mkdep - if $mkdep dep.c >dep.out 2>/dev/null && - $contains "dep$_o:.*dep\.h" dep.out >/dev/null 2>&1 + chmod +x tryinst + $eunicefix tryinst + dflt='' + either='' + for prog in $tryit; do + $echo $n "Checking $prog... $c" + ./tryinst $prog >/dev/null 2>&1 + if $test -d foo/bar; then + creatdir="$prog -d" + fi + (ls -l d/try >try.ls; ls -l d/try.ns >tryno.ls) 2>/dev/null + if (cmp -s d/try try && cmp -s d/try.ns try.ns && \ + $contains 'rwxrw-r--' tryno.ls && \ + $contains 'rw-r---w-' try.ls) >/dev/null 2>&1 then - cat << EOM + dflt="$prog" + echo "ok, that will do." + break + fi + echo "not good$either." + either=' either' + $rm -f try*.ls + done + $rm -rf foo d tryinst try try*.ls try.* + case "$dflt" in + '') + echo "Hopefully, $package comes with its own install script!" + dflt='./install' + ;; + esac + ;; +*) dflt="$install";; +esac +$cat <<EOM -I can use a script with grep instead, but it will make some incorrect -dependencies, since it doesn't understand about conditional compilation. -Moreover, some dependencies may be missing, because scanning won't be -a recursive process. -If you have a program which generates makefile dependencies, you may want -to use it. If not, you can use the script and edit the Makefile by hand -if you need to. +I will be requiring a BSD-compatible install program (one that allows +options like -s to strip executables or -m to specify a file mode) to +install $package. + +If the question below contains a fully qualified default path, then it +is probably ok. If it is an unqualified name such as 'install', then it +means I was unable to find out a good install program I could use. If +you know of one, please tell me about it. If the default is './install', +then I shall be using the install script supplied with $package. + EOM - else - mkdep= - cat << EOM +fn='/fe~(install,./install)' +rp='Which install program shall I use?' +. ./getfile +install="$ans" -I can't seem to generate makefile dependencies at all! Perhaps you have a -program that does? If you don't, you might look at the mkdep script to -see if you can create one which works. -EOM - fi +: how can we create nested directories? +echo " " +echo "Ok, let's see how we can create nested directories..." >&4 +case "$installdir" in +'') + $mkdir -p foo/bar >/dev/null 2>&1 + if $test -d foo/bar; then + echo "Great, we can build them using 'mkdir -p'." + creatdir='mkdir -p' + else + case "$creatdir" in + '') + if eval "$install -d foo/bar"; $test -d foo/bar; then + creatdir="install -d" + echo "It looks like '$creatdir' will do it for us." + fi + ;; + *) + eval "$creatdir foo/bar" >/dev/null 2>&1 + if $test -d foo/bar; then + echo "Ah! We can use '$creatdir' to do just that." + else + creatdir='' + fi + ;; + esac fi + $rm -rf foo + case "$creatdir" in + '') + echo "Heck! Another ancient system lacking the comfort of modern ones!" + echo "You can thank $package for bringing you its own install script!" + installdir='./install -d' + ;; + *) installdir="$creatdir";; + esac + ;; +*) echo "As you already told me, '$installdir' should work.";; esac -dflt="$mkdep" -fn=f~/ -rp="Name of program to make makefile dependencies?" + +: determine the name of a reasonable mailer +case "$mailer" in +'') + if $test -f "$sendmail"; then + dflt="$sendmail" + elif $test -f "$smail"; then + dflt="$smail" + elif $test -f "$rmail"; then + dflt="$rmail" + elif $test -f /bin/mail; then + dflt=/bin/mail + else + dflt=$mail + fi + ;; +*) dflt="$mailer";; +esac +$cat <<EOM + +I need the full pathname of the program used to deliver mail on your system. +A typical answer would be /usr/lib/sendmail or /bin/rmail, but you may choose +any other program, as long as it can be fed from standard input and will +honour any user-supplied headers. + +EOM +fn=f +rp='Mail transport agent to be used?' . ./getfile -mkdep="$ans" -$rm -f dep.c dep.h dep$_o dep.out +mailer="$ans" : find out how to find out full name case "$d_berknames" in @@ -3444,26 +4162,31 @@ done : locate the preferred pager for this system +fn=f/ case "$pager" in '') dflt='' case "$pg" in /*) dflt=$pg;; + [a-zA-Z]:/*) dflt=$pg;; esac case "$more" in /*) dflt=$more;; + [a-zA-Z]:/*) dflt=$more;; esac case "$less" in /*) dflt=$less;; + [a-zA-Z]:/*) dflt=$less;; esac case "$dflt" in '') dflt=/usr/ucb/more;; esac ;; -*) dflt="$pager";; +*) dflt="$pager" + fn="f/($pager)" + ;; esac echo " " -fn=f/ rp='What pager is used on your system?' . ./getfile pager="$ans" @@ -3610,13 +4333,16 @@ # Configured by : $cf_by # Target system : $myuname +EOT +$test -f UU/cmdline.opt && $cat UU/cmdline.opt >> config.sh +$spitshell <<EOT >>config.sh + Author='$Author' Date='$Date' Header='$Header' Id='$Id' Locker='$Locker' Log='$Log' -Mcc='$Mcc' RCSfile='$RCSfile' Revision='$Revision' Source='$Source' @@ -3625,6 +4351,7 @@ _exe='$_exe' _o='$_o' afs='$afs' +afsroot='$afsroot' ar='$ar' archobjs='$archobjs' awk='$awk' @@ -3634,6 +4361,7 @@ byacc='$byacc' c='$c' cat='$cat' +ccflags='$ccflags' ccname='$ccname' ccversion='$ccversion' cf_by='$cf_by' @@ -3649,6 +4377,7 @@ cpio='$cpio' cpp='$cpp' cpp_trad='$cpp_trad' +cppflags='$cppflags' cpplast='$cpplast' cppminus='$cppminus' cpprun='$cpprun' @@ -3656,8 +4385,10 @@ csh='$csh' d_berknames='$d_berknames' d_bsd='$d_bsd' +d_dos='$d_dos' d_eunice='$d_eunice' d_linux='$d_linux' +d_os2='$d_os2' d_passnames='$d_passnames' d_portable='$d_portable' d_usgnames='$d_usgnames' @@ -3673,12 +4404,16 @@ firstmakefile='$firstmakefile' flex='$flex' from='$from' +gccosandvers='$gccosandvers' +gccversion='$gccversion' +glibpth='$glibpth' gmake='$gmake' grep='$grep' groupcat='$groupcat' gzip='$gzip' hint='$hint' hostcat='$hostcat' +incpath='$incpath' inews='$inews' install='$install' installdir='$installdir' @@ -3687,11 +4422,16 @@ installscript='$installscript' issymlink='$issymlink' ksh='$ksh' +ldflags='$ldflags' less='$less' +libpth='$libpth' line='$line' lint='$lint' +lkflags='$lkflags' ln='$ln' lns='$lns' +locincpth='$locincpth' +loclibpth='$loclibpth' lp='$lp' lpr='$lpr' ls='$ls' @@ -3703,7 +4443,7 @@ manext='$manext' mansrc='$mansrc' mansrcexp='$mansrcexp' -mkdep='$mkdep' +mips_type='$mips_type' mkdir='$mkdir' more='$more' mv='$mv' @@ -3714,6 +4454,7 @@ nametype='$nametype' nm='$nm' nroff='$nroff' +optimize='$optimize' orgname='$orgname' osname='$osname' osvers='$osvers' @@ -3725,6 +4466,8 @@ perlpath='$perlpath' pg='$pg' phostname='$phostname' +pkgsrc='$pkgsrc' +plibpth='$plibpth' pmake='$pmake' pr='$pr' prefix='$prefix' @@ -3766,8 +4509,10 @@ uname='$uname' uniq='$uniq' usecrosscompile='$usecrosscompile' +usrinc='$usrinc' uuname='$uuname' vi='$vi' +xlibpth='$xlibpth' zcat='$zcat' zip='$zip' EOT @@ -3779,9 +4524,10 @@ : propagate old symbols if $test -f UU/config.sh; then - <UU/config.sh sort | uniq >UU/oldconfig.sh - sed -n 's/^\([a-zA-Z_0-9]*\)=.*/\1/p' config.sh config.sh UU/oldconfig.sh |\ - sort | uniq -u >UU/oldsyms + <UU/config.sh $sort | $uniq >UU/oldconfig.sh + $sed -n 's/^\([a-zA-Z_0-9]*\)=.*/\1/p' \ + config.sh config.sh UU/oldconfig.sh |\ + $sort | $uniq -u >UU/oldsyms set X `cat UU/oldsyms` shift case $# in @@ -3790,7 +4536,7 @@ cat <<EOM Hmm...You had some extra variables I don't know about...I'll try to keep 'em... EOM - echo "# Variables propagated from previous config.sh file." >>config.sh + echo ": Variables propagated from previous config.sh file." >>config.sh for sym in `cat UU/oldsyms`; do echo " Propagating $hint variable "'$'"$sym..." eval 'tmp="$'"${sym}"'"' Modified: trunk/dist/patchlevel.h =================================================================== --- trunk/dist/patchlevel.h 2006-08-25 22:33:07 UTC (rev 10) +++ trunk/dist/patchlevel.h 2006-08-25 22:35:20 UTC (rev 11) @@ -1,4 +1,5 @@ /* dist-3.0 - 18 Aug 1993 */ +/* dist-3.5 - 25 Aug 2006 */ -#define VERSION 3.0 -#define PATCHLEVEL 70 +#define VERSION 3.5 +#define PATCHLEVEL 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-25 22:33:39
|
Revision: 10 Author: rmanfredi Date: 2006-08-25 15:33:07 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=10&view=rev Log Message: ----------- Regenerated all Makefile.SH files. Modified Paths: -------------- trunk/dist/Makefile.SH trunk/dist/bin/Makefile.SH trunk/dist/jmake/Makefile.SH trunk/dist/kit/Makefile.SH trunk/dist/lib/C/Makefile.SH trunk/dist/lib/C/fake/Makefile.SH trunk/dist/lib/Makefile.SH trunk/dist/mcon/Makefile.SH trunk/dist/mcon/man/Makefile.SH trunk/dist/pat/Makefile.SH Modified: trunk/dist/Makefile.SH =================================================================== --- trunk/dist/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,6 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL55] -: $X-Id: Jmake.tmpl,v 3.0.1.2 1995/01/11 14:50:21 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ + case $CONFIG in '') if test -f config.sh; then TOP=.; @@ -21,6 +22,7 @@ echo "Extracting ${DIR}Makefile (with variable substitutions)" INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'` +INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'` DATE=`date` $spitshell >Makefile <<!GROK!THIS! @@ -33,14 +35,15 @@ CURRENT = $CURRENT DIR = $DIR INSTALL = $INSTALL +INSTALLDIR = $INSTALLDIR ######################################################################## # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags +JCPPFLAGS = $cppflags L = $manext MANSRC = $installmansrc -MAKE = make MV = $mv RM = $rm -f @@ -53,14 +56,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.3 1995/03/21 08:35:28 ram Exp ram $ +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ + ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0.1.2 1995/07/25 13:29:41 ram Exp ram $ +# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -84,30 +88,34 @@ @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ for i in bin mcon pat jmake kit ;\ do \ - (cd $$i ; echo "Depending" "in $(DIR)$$i..."; \ - $(MAKE) $(MFLAGS) depend); \ + (cd $$i ; echo "Depending" "in $(DIR)$$i..."; \ + $(MAKE) $(MFLAGS) depend) || exit 1; \ done local_clobber:: $(RM) install -install.man:: dist.man - $(INSTALL) -c -m 444 dist.man $(MANSRC)/dist.$(L) +local_install.man:: dist.man + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \ + $(INSTALL) -c -m 444 dist.man $(INSTALL_PREFIX)$(MANSRC)/dist.$(L) -deinstall.man:: - $(RM) $(MANSRC)/dist.$(L) +local_deinstall.man:: + $(RM) $(INSTALL_PREFIX)$(MANSRC)/dist.$(L) ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: sub_clean local_clean realclean: sub_realclean local_realclean clobber: sub_clobber local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean $(RM) -r UU @@ -117,15 +125,36 @@ $(RM) -r .config $(RM) Makefile +install:: local_install sub_install +install.man:: maybe_install.man sub_install.man +deinstall:: sub_deinstall local_deinstall +deinstall.man:: sub_deinstall.man maybe_deinstall.man + +install.man-yes: local_install.man +install.man-no: +deinstall.man-yes: local_deinstall.man +deinstall.man-no: + +!NO!SUBS! +case "$installmansrc" in +'') man=no;; +*) man=yes;; +esac +$spitshell >>Makefile <<!GROK!THIS! +maybe_install.man: install.man-$man +maybe_deinstall.man: deinstall.man-$man +!GROK!THIS! +$spitshell >>Makefile <<'!NO!SUBS!' + Makefile.SH: Jmakefile -@if test -f $(TOP)/.package; then \ - if test -f Makefile.SH; then \ - echo " $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \ - $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \ - fi; \ - echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ - $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ - else touch $@; exit 0; fi + if test -f Makefile.SH; then \ + echo " $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \ + $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \ + fi; \ + echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ + $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ + else touch $@; fi Makefile: Makefile.SH /bin/sh Makefile.SH @@ -144,21 +173,23 @@ @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ for i in $(SUBDIRS) ;\ do \ - (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \ - $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \ + (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \ + $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \ done -install:: +sub_install:: @$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS= -deinstall:: +sub_deinstall:: @$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS= + @echo "Back to $(CURRENT) for "deinstall... -install.man:: +sub_install.man:: @$(MAKE) subdirs TARGET=install.man VERB="Installing man pages" FLAGS= -deinstall.man:: +sub_deinstall.man:: @$(MAKE) subdirs TARGET=deinstall.man VERB="Deinstalling man pages" FLAGS= + @echo "Back to $(CURRENT) for "deinstall.man... sub_clean:: @$(MAKE) subdirs TARGET=clean VERB="Cleaning" FLAGS= @@ -176,42 +207,51 @@ @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ for i in $(SUBDIRS) ;\ do \ - (cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \ - $(MAKE) $(MFLAGS) tag); \ + (cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \ + $(MAKE) $(MFLAGS) tag) || exit 1; \ done Makefiles:: @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ for i in $(SUBDIRS);\ do \ - echo "Making "Makefiles" in $(DIR)$$i..."; \ - (cd $$i || exit 1; \ - if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \ - $(MAKE) $(MFLAGS) Makefiles) \ + echo "Making "Makefiles" in $(DIR)$$i..."; \ + (cd $$i || exit 1; \ + if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \ + $(MAKE) $(MFLAGS) Makefiles) || exit 1;\ done Makefiles.SH:: Makefile.SH @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ for i in $(SUBDIRS);\ do \ - case "$(DIR)$$i/" in \ - */*/*/*/) newtop=../../../..;; \ - */*/*/) newtop=../../..;; \ - */*/) newtop=../..;; \ - */) newtop=..;; \ - esac; \ - case "$(TOP)" in \ - /*) newtop="$(TOP)" ;; \ - esac; \ - echo "Making Makefiles.SH in $(DIR)$$i..."; \ - (cd $$i || exit 1; $(MAKE) $(MFLAGS) -f ../Makefile \ - Makefile TOP=$$newtop CURRENT=$(DIR)$$i;\ - $(MAKE) $(MFLAGS) Makefiles.SH) \ + case "$(DIR)$$i/" in \ + */*/*/*/) newtop=../../../..;; \ + */*/*/) newtop=../../..;; \ + */*/) newtop=../..;; \ + */) newtop=..;; \ + esac; \ + case "$(TOP)" in \ + /*) newtop="$(TOP)" ;; \ + esac; \ + echo "Making Makefiles.SH in $(DIR)$$i..."; \ + (cd $$i || exit 1; \ + if test -f Jmakefile; then \ + $(MAKE) $(MFLAGS) -f ../Makefile \ + Makefile TOP=$$newtop CURRENT=$(DIR)$$i && \ + $(MAKE) $(MFLAGS) Makefiles.SH; \ + fi; \ + ) || exit 1; \ done all:: @$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS= +local_install:: +local_deinstall:: +local_install.man:: +local_deinstall.man:: + !NO!SUBS! chmod 644 Makefile $eunicefix Makefile Modified: trunk/dist/bin/Makefile.SH =================================================================== --- trunk/dist/bin/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/bin/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44] -: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ case $CONFIG in '') @@ -22,6 +22,7 @@ echo "Extracting ${DIR}Makefile (with variable substitutions)" INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'` +INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'` DATE=`date` $spitshell >Makefile <<!GROK!THIS! @@ -34,15 +35,15 @@ CURRENT = $CURRENT DIR = $DIR INSTALL = $INSTALL +INSTALLDIR = $INSTALLDIR ######################################################################## # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags +JCPPFLAGS = $cppflags L = $manext MANSRC = $installmansrc -MAKE = make -MKDEP = $mkdep \$(DPFLAGS) -- MV = $mv RM = $rm -f SCRIPTDIR = $installscript @@ -57,22 +58,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $ +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ ######################################################################## -# Force 'make depend' to be performed first -- do not edit - -.FORCE_DEPEND:: - -all:: .FORCE_DEPEND - -######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0.1.1 1994/01/24 13:42:53 ram Exp ram $ +# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -105,34 +99,40 @@ /bin/sh manilist.SH -install:: $(SCRIPTS) $(LSCRIPTS) - @for file in $(SCRIPTS) $(LSCRIPTS); do \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - (set -x; $(INSTALL) -c -m 555 $$file $(SCRIPTDIR)); \ +local_install:: $(SCRIPTS) $(LSCRIPTS) + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \ + for file in $(SCRIPTS) $(LSCRIPTS); do \ + (set -x; \ + $(INSTALL) -c -m 555 $$file $(INSTALL_PREFIX)$(SCRIPTDIR)) || \ + exit 1; \ done -deinstall:: +local_deinstall:: @for file in $(SCRIPTS) $(LSCRIPTS); do \ case '${MFLAGS}' in *[i]*) set +e;; esac; \ - (set -x; $(RM) $(SCRIPTDIR)/$$file); \ + (set -x; $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/$$file); \ done -install.man:: - @if test "$(MANSRC)"; then \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for file in $(SCRIPTS); do \ +local_install.man:: + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \ + for file in $(SCRIPTS); do \ + if test -f $$file.man; then \ (set -x; \ - $(INSTALL) -c -m 444 $$file.man $(MANSRC)/$$file.$(L)); \ - done; \ - else exit 0; fi + $(INSTALL) -c -m 444 $$file.man \ + $(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)) || \ + exit 1; \ + fi; \ + done -deinstall.man:: - @if test "$(MANSRC)"; then \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for file in $(SCRIPTS); do \ - (set -x; $(RM) $(MANSRC)/$$file.$(L)); \ - done; \ - else exit 0; fi +local_deinstall.man:: + case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for file in $(SCRIPTS); do \ + (set -x; $(RM) $(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)); \ + done BINSH = \ packinit.SH \ @@ -150,20 +150,42 @@ ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: local_clean realclean: local_realclean clobber: local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean local_clobber:: local_realclean $(RM) Makefile config.sh +install:: local_install +install.man:: maybe_install.man +deinstall:: local_deinstall +deinstall.man:: maybe_deinstall.man + +install.man-yes: local_install.man +install.man-no: +deinstall.man-yes: local_deinstall.man +deinstall.man-no: + +!NO!SUBS! +case "$installmansrc" in +'') man=no;; +*) man=yes;; +esac +$spitshell >>Makefile <<!GROK!THIS! +maybe_install.man: install.man-$man +maybe_deinstall.man: deinstall.man-$man +!GROK!THIS! +$spitshell >>Makefile <<'!NO!SUBS!' + Makefile.SH: Jmakefile -@if test -f $(TOP)/.package; then \ if test -f Makefile.SH; then \ @@ -172,7 +194,7 @@ fi; \ echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ - else touch $@; exit 0; fi + else touch $@; fi Makefile: Makefile.SH /bin/sh Makefile.SH @@ -187,29 +209,22 @@ ######################################################################## # Empty rules for directories with no sub-directories -- do not edit -install:: +local_install:: @echo "install in $(CURRENT) done." -deinstall:: +local_deinstall:: @echo "deinstall in $(CURRENT) done." -install.man:: +local_install.man:: @echo "install.man in $(CURRENT) done." -deinstall.man:: +local_deinstall.man:: @echo "deinstall.man in $(CURRENT) done." Makefiles:: Makefiles.SH:: -######################################################################## -# Dependencies generated by make depend -# DO NOT DELETE THIS LINE -- make depend relies on it - -# Put nothing here or make depend will gobble it up -.FORCE_DEPEND:: - @echo "You must run 'make depend' in $(TOP) first."; exit 1 !NO!SUBS! chmod 644 Makefile $eunicefix Makefile Modified: trunk/dist/jmake/Makefile.SH =================================================================== --- trunk/dist/jmake/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/jmake/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL70] -: $X-Id: Jmake.tmpl,v 3.0.1.3 1997/02/28 14:56:16 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ case $CONFIG in '') @@ -41,6 +41,7 @@ # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags +JCPPFLAGS = $cppflags L = $manext MANSRC = $installmansrc MV = $mv @@ -58,15 +59,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.7 2004/08/22 08:28:58 ram Exp ram $ +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0.1.2 1995/03/21 08:34:16 ram Exp ram $ +# $X-Id: Jmakefile 3 2006-08-25 21:39:07Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -106,12 +107,13 @@ local_install:: $(SCRIPTS) $(LSCRIPTS) - case '${MFLAGS}' in *[i]*) set +e;; esac; \ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ (set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \ $(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \ for file in $(SCRIPTS) $(LSCRIPTS); do \ (set -x; \ - $(INSTALL) -c -m 555 $$file $(INSTALL_PREFIX)$(SCRIPTDIR)); \ + $(INSTALL) -c -m 555 $$file $(INSTALL_PREFIX)$(SCRIPTDIR)) || \ + exit 1; \ done local_deinstall:: @@ -121,14 +123,15 @@ done local_install.man:: - case '${MFLAGS}' in *[i]*) set +e;; esac; \ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ (set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \ $(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \ for file in $(SCRIPTS); do \ if test -f $$file.man; then \ (set -x; \ $(INSTALL) -c -m 444 $$file.man \ - $(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)); \ + $(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)) || \ + exit 1; \ fi; \ done @@ -151,22 +154,20 @@ local_install:: - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ for dir in $(PRIVLIB) $(PRIVLIB)/files; do \ - (set -x; test -d $(INSTALL_PREFIX)$$dir || \ + (set -x; test -d $(INSTALL_PREFIX)$$dir || \ $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \ done local_deinstall:: - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ for dir in $(PRIVLIB) $(PRIVLIB)/files; do \ (set -x; test -d $$dir && $(RM) -r $(INSTALL_PREFIX)$$dir); \ done local_install:: Index - case '${MFLAGS}' in *[i]*) set +e;; esac; \ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \ $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \ $(INSTALL) -c -m 444 Index $(INSTALL_PREFIX)$(PRIVLIB) @@ -175,7 +176,7 @@ $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/Index local_install:: bindex - case '${MFLAGS}' in *[i]*) set +e;; esac; \ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \ $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \ $(INSTALL) -c -m 555 bindex $(INSTALL_PREFIX)$(PRIVLIB) @@ -184,7 +185,7 @@ $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/bindex local_install:: fixcpp - case '${MFLAGS}' in *[i]*) set +e;; esac; \ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/files || \ $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/files); \ $(INSTALL) -c -m 555 fixcpp $(INSTALL_PREFIX)$(PRIVLIB)/files @@ -193,11 +194,12 @@ $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/files/fixcpp local_install:: files/Jmake* - case '${MFLAGS}' in *[i]*) set +e;; esac; \ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/files || \ $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/files); \ for i in files/Jmake*; do \ - (set -x; $(INSTALL) -c -m 444 $$i $(INSTALL_PREFIX)$(PRIVLIB)/files); \ + (set -x; $(INSTALL) -c -m 444 \ + $$i $(INSTALL_PREFIX)$(PRIVLIB)/files) || exit 1;\ done local_deinstall:: @@ -220,24 +222,25 @@ ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: local_clean realclean: local_realclean clobber: local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean local_clobber:: local_realclean $(RM) Makefile config.sh -install: local_install -install.man: maybe_install.man -deinstall: local_deinstall -deinstall.man: maybe_deinstall.man +install:: local_install +install.man:: maybe_install.man +deinstall:: local_deinstall +deinstall.man:: maybe_deinstall.man install.man-yes: local_install.man install.man-no: Modified: trunk/dist/kit/Makefile.SH =================================================================== --- trunk/dist/kit/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/kit/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44] -: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ case $CONFIG in '') @@ -22,6 +22,7 @@ echo "Extracting ${DIR}Makefile (with variable substitutions)" INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'` +INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'` DATE=`date` $spitshell >Makefile <<!GROK!THIS! @@ -34,15 +35,15 @@ CURRENT = $CURRENT DIR = $DIR INSTALL = $INSTALL +INSTALLDIR = $INSTALLDIR ######################################################################## # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags +JCPPFLAGS = $cppflags L = $manext MANSRC = $installmansrc -MAKE = make -MKDEP = $mkdep \$(DPFLAGS) -- MV = $mv RM = $rm -f SCRIPTDIR = $installscript @@ -57,22 +58,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $ +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ ######################################################################## -# Force 'make depend' to be performed first -- do not edit - -.FORCE_DEPEND:: - -all:: .FORCE_DEPEND - -######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0.1.2 1994/04/22 09:35:35 ram Exp ram $ +# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -110,46 +104,58 @@ /bin/sh kitpost.SH -install:: $(SCRIPTS) $(LSCRIPTS) - @for file in $(SCRIPTS) $(LSCRIPTS); do \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - (set -x; $(INSTALL) -c -m 555 $$file $(SCRIPTDIR)); \ +local_install:: $(SCRIPTS) $(LSCRIPTS) + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \ + for file in $(SCRIPTS) $(LSCRIPTS); do \ + (set -x; \ + $(INSTALL) -c -m 555 $$file $(INSTALL_PREFIX)$(SCRIPTDIR)) || \ + exit 1; \ done -deinstall:: +local_deinstall:: @for file in $(SCRIPTS) $(LSCRIPTS); do \ case '${MFLAGS}' in *[i]*) set +e;; esac; \ - (set -x; $(RM) $(SCRIPTDIR)/$$file); \ + (set -x; $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/$$file); \ done -install.man:: - @if test "$(MANSRC)"; then \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for file in $(SCRIPTS); do \ +local_install.man:: + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \ + for file in $(SCRIPTS); do \ + if test -f $$file.man; then \ (set -x; \ - $(INSTALL) -c -m 444 $$file.man $(MANSRC)/$$file.$(L)); \ - done; \ - else exit 0; fi + $(INSTALL) -c -m 444 $$file.man \ + $(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)) || \ + exit 1; \ + fi; \ + done -deinstall.man:: - @if test "$(MANSRC)"; then \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for file in $(SCRIPTS); do \ - (set -x; $(RM) $(MANSRC)/$$file.$(L)); \ - done; \ - else exit 0; fi +local_deinstall.man:: + case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for file in $(SCRIPTS); do \ + (set -x; $(RM) $(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)); \ + done -install:: makeSH - $(INSTALL) -c -m 555 makeSH $(SCRIPTDIR) +local_install:: makeSH + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \ + $(INSTALL) -c -m 555 makeSH $(INSTALL_PREFIX)$(SCRIPTDIR) -deinstall:: - $(RM) $(SCRIPTDIR)/makeSH +local_deinstall:: + $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/makeSH -install.man:: makeSH.man - $(INSTALL) -c -m 444 makeSH.man $(MANSRC)/makeSH.$(L) +local_install.man:: makeSH.man + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \ + $(INSTALL) -c -m 444 makeSH.man $(INSTALL_PREFIX)$(MANSRC)/makeSH.$(L) -deinstall.man:: - $(RM) $(MANSRC)/makeSH.$(L) +local_deinstall.man:: + $(RM) $(INSTALL_PREFIX)$(MANSRC)/makeSH.$(L) SCRIPTSH = \ makedist.SH \ @@ -169,20 +175,42 @@ ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: local_clean realclean: local_realclean clobber: local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean local_clobber:: local_realclean $(RM) Makefile config.sh +install:: local_install +install.man:: maybe_install.man +deinstall:: local_deinstall +deinstall.man:: maybe_deinstall.man + +install.man-yes: local_install.man +install.man-no: +deinstall.man-yes: local_deinstall.man +deinstall.man-no: + +!NO!SUBS! +case "$installmansrc" in +'') man=no;; +*) man=yes;; +esac +$spitshell >>Makefile <<!GROK!THIS! +maybe_install.man: install.man-$man +maybe_deinstall.man: deinstall.man-$man +!GROK!THIS! +$spitshell >>Makefile <<'!NO!SUBS!' + Makefile.SH: Jmakefile -@if test -f $(TOP)/.package; then \ if test -f Makefile.SH; then \ @@ -191,7 +219,7 @@ fi; \ echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ - else touch $@; exit 0; fi + else touch $@; fi Makefile: Makefile.SH /bin/sh Makefile.SH @@ -206,29 +234,22 @@ ######################################################################## # Empty rules for directories with no sub-directories -- do not edit -install:: +local_install:: @echo "install in $(CURRENT) done." -deinstall:: +local_deinstall:: @echo "deinstall in $(CURRENT) done." -install.man:: +local_install.man:: @echo "install.man in $(CURRENT) done." -deinstall.man:: +local_deinstall.man:: @echo "deinstall.man in $(CURRENT) done." Makefiles:: Makefiles.SH:: -######################################################################## -# Dependencies generated by make depend -# DO NOT DELETE THIS LINE -- make depend relies on it - -# Put nothing here or make depend will gobble it up -.FORCE_DEPEND:: - @echo "You must run 'make depend' in $(TOP) first."; exit 1 !NO!SUBS! chmod 644 Makefile $eunicefix Makefile Modified: trunk/dist/lib/C/Makefile.SH =================================================================== --- trunk/dist/lib/C/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/lib/C/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44] -: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ case $CONFIG in '') @@ -37,7 +37,7 @@ # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags -MAKE = make +JCPPFLAGS = $cppflags MV = $mv RM = $rm -f @@ -50,15 +50,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $ +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0.1.1 1994/01/24 13:43:38 ram Exp ram $ +# $X-Id: Jmakefile 3 2006-08-25 21:39:07Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -73,20 +73,32 @@ ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: sub_clean local_clean realclean: sub_realclean local_realclean clobber: sub_clobber local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean local_clobber:: local_realclean $(RM) Makefile config.sh +install:: local_install sub_install +install.man:: maybe_install.man sub_install.man +deinstall:: sub_deinstall local_deinstall +deinstall.man:: sub_deinstall.man maybe_deinstall.man + +install.man-no: +deinstall.man-no: + +maybe_install.man: install.man-no +maybe_deinstall.man: deinstall.man-no + Makefile.SH: Jmakefile -@if test -f $(TOP)/.package; then \ if test -f Makefile.SH; then \ @@ -95,7 +107,7 @@ fi; \ echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ - else touch $@; exit 0; fi + else touch $@; fi Makefile: Makefile.SH /bin/sh Makefile.SH @@ -115,20 +127,22 @@ for i in $(SUBDIRS) ;\ do \ (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \ - $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \ + $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \ done -install:: +sub_install:: @$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS= -deinstall:: +sub_deinstall:: @$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS= + @echo "Back to $(CURRENT) for "deinstall... -install.man:: +sub_install.man:: @$(MAKE) subdirs TARGET=install.man VERB="Installing man pages" FLAGS= -deinstall.man:: +sub_deinstall.man:: @$(MAKE) subdirs TARGET=deinstall.man VERB="Deinstalling man pages" FLAGS= + @echo "Back to $(CURRENT) for "deinstall.man... sub_clean:: @$(MAKE) subdirs TARGET=clean VERB="Cleaning" FLAGS= @@ -147,7 +161,7 @@ for i in $(SUBDIRS) ;\ do \ (cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \ - $(MAKE) $(MFLAGS) tag); \ + $(MAKE) $(MFLAGS) tag) || exit 1; \ done Makefiles:: @@ -157,7 +171,7 @@ echo "Making "Makefiles" in $(DIR)$$i..."; \ (cd $$i || exit 1; \ if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \ - $(MAKE) $(MFLAGS) Makefiles) \ + $(MAKE) $(MFLAGS) Makefiles) || exit 1;\ done Makefiles.SH:: Makefile.SH @@ -174,14 +188,23 @@ /*) newtop="$(TOP)" ;; \ esac; \ echo "Making Makefiles.SH in $(DIR)$$i..."; \ - (cd $$i || exit 1; $(MAKE) $(MFLAGS) -f ../Makefile \ - Makefile TOP=$$newtop CURRENT=$(DIR)$$i;\ - $(MAKE) $(MFLAGS) Makefiles.SH) \ + (cd $$i || exit 1; \ + if test -f Jmakefile; then \ + $(MAKE) $(MFLAGS) -f ../Makefile \ + Makefile TOP=$$newtop CURRENT=$(DIR)$$i && \ + $(MAKE) $(MFLAGS) Makefiles.SH; \ + fi; \ + ) || exit 1; \ done all:: @$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS= +local_install:: +local_deinstall:: +local_install.man:: +local_deinstall.man:: + !NO!SUBS! chmod 644 Makefile $eunicefix Makefile Modified: trunk/dist/lib/C/fake/Makefile.SH =================================================================== --- trunk/dist/lib/C/fake/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/lib/C/fake/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44] -: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ case $CONFIG in '') @@ -41,7 +41,7 @@ # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags -MAKE = make +JCPPFLAGS = $cppflags MV = $mv PRIVLIB = $installprivlib RM = $rm -f @@ -50,15 +50,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $ +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0.1.1 1994/01/24 13:43:44 ram Exp ram $ +# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -77,40 +77,56 @@ all:: install:: - @for dir in $(PRIVLIB)/lib/C/fake; do \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - (set -x; test -d $$dir || $(INSTALLDIR) $$dir); \ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for dir in $(PRIVLIB)/lib/C/fake; do \ + (set -x; test -d $$dir || $(INSTALLDIR) $$dir) || \ + exit 1; \ done -install:: $(FILES) - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ +local_install:: $(FILES) + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/lib/C/fake || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/lib/C/fake); \ for i in $(FILES); do \ - (set -x; $(INSTALL) -c $(INSTALLFLAGS) $$i $(PRIVLIB)/lib/C/fake); \ + (set -x; $(INSTALL) -c $(INSTALLFLAGS) \ + $$i $(INSTALL_PREFIX)$(PRIVLIB)/lib/C/fake) || exit 1;\ done -deinstall:: +local_deinstall:: @case '${MFLAGS}' in *[i]*) set +e;; esac; \ for i in $(FILES); do \ - (set -x; $(RM) $(PRIVLIB)/lib/C/fake/$$i); \ + (set -x; $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/lib/C/fake/$$i); \ done ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: local_clean realclean: local_realclean clobber: local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean local_clobber:: local_realclean $(RM) Makefile config.sh +install:: local_install +install.man:: maybe_install.man +deinstall:: local_deinstall +deinstall.man:: maybe_deinstall.man + +install.man-no: +deinstall.man-no: + +maybe_install.man: install.man-no +maybe_deinstall.man: deinstall.man-no + Makefile.SH: Jmakefile -@if test -f $(TOP)/.package; then \ if test -f Makefile.SH; then \ @@ -119,7 +135,7 @@ fi; \ echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ - else touch $@; exit 0; fi + else touch $@; fi Makefile: Makefile.SH /bin/sh Makefile.SH @@ -134,16 +150,16 @@ ######################################################################## # Empty rules for directories with no sub-directories -- do not edit -install:: +local_install:: @echo "install in $(CURRENT) done." -deinstall:: +local_deinstall:: @echo "deinstall in $(CURRENT) done." -install.man:: +local_install.man:: @echo "install.man in $(CURRENT) done." -deinstall.man:: +local_deinstall.man:: @echo "deinstall.man in $(CURRENT) done." Makefiles:: Modified: trunk/dist/lib/Makefile.SH =================================================================== --- trunk/dist/lib/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/lib/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44] -: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ case $CONFIG in '') @@ -41,7 +41,7 @@ # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags -MAKE = make +JCPPFLAGS = $cppflags MV = $mv PRIVLIB = $installprivlib RM = $rm -f @@ -55,15 +55,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $ +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0.1.1 1994/01/24 13:43:31 ram Exp ram $ +# $X-Id: Jmakefile 5 2006-08-25 22:09:39Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -86,21 +86,25 @@ all:: install:: - @for dir in $(PRIVLIB)/lib; do \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - (set -x; test -d $$dir || $(INSTALLDIR) $$dir); \ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for dir in $(PRIVLIB)/lib; do \ + (set -x; test -d $$dir || $(INSTALLDIR) $$dir) || \ + exit 1; \ done -install:: $(FILES) - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ +local_install:: $(FILES) + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/lib || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/lib); \ for i in $(FILES); do \ - (set -x; $(INSTALL) -c $(INSTALLFLAGS) $$i $(PRIVLIB)/lib); \ + (set -x; $(INSTALL) -c $(INSTALLFLAGS) \ + $$i $(INSTALL_PREFIX)$(PRIVLIB)/lib) || exit 1;\ done -deinstall:: +local_deinstall:: @case '${MFLAGS}' in *[i]*) set +e;; esac; \ for i in $(FILES); do \ - (set -x; $(RM) $(PRIVLIB)/lib/$$i); \ + (set -x; $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/lib/$$i); \ done @@ -131,20 +135,32 @@ ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: sub_clean local_clean realclean: sub_realclean local_realclean clobber: sub_clobber local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean local_clobber:: local_realclean $(RM) Makefile config.sh +install:: local_install sub_install +install.man:: maybe_install.man sub_install.man +deinstall:: sub_deinstall local_deinstall +deinstall.man:: sub_deinstall.man maybe_deinstall.man + +install.man-no: +deinstall.man-no: + +maybe_install.man: install.man-no +maybe_deinstall.man: deinstall.man-no + Makefile.SH: Jmakefile -@if test -f $(TOP)/.package; then \ if test -f Makefile.SH; then \ @@ -153,7 +169,7 @@ fi; \ echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ - else touch $@; exit 0; fi + else touch $@; fi Makefile: Makefile.SH /bin/sh Makefile.SH @@ -173,20 +189,22 @@ for i in $(SUBDIRS) ;\ do \ (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \ - $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \ + $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \ done -install:: +sub_install:: @$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS= -deinstall:: +sub_deinstall:: @$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS= + @echo "Back to $(CURRENT) for "deinstall... -install.man:: +sub_install.man:: @$(MAKE) subdirs TARGET=install.man VERB="Installing man pages" FLAGS= -deinstall.man:: +sub_deinstall.man:: @$(MAKE) subdirs TARGET=deinstall.man VERB="Deinstalling man pages" FLAGS= + @echo "Back to $(CURRENT) for "deinstall.man... sub_clean:: @$(MAKE) subdirs TARGET=clean VERB="Cleaning" FLAGS= @@ -205,7 +223,7 @@ for i in $(SUBDIRS) ;\ do \ (cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \ - $(MAKE) $(MFLAGS) tag); \ + $(MAKE) $(MFLAGS) tag) || exit 1; \ done Makefiles:: @@ -215,7 +233,7 @@ echo "Making "Makefiles" in $(DIR)$$i..."; \ (cd $$i || exit 1; \ if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \ - $(MAKE) $(MFLAGS) Makefiles) \ + $(MAKE) $(MFLAGS) Makefiles) || exit 1;\ done Makefiles.SH:: Makefile.SH @@ -232,14 +250,23 @@ /*) newtop="$(TOP)" ;; \ esac; \ echo "Making Makefiles.SH in $(DIR)$$i..."; \ - (cd $$i || exit 1; $(MAKE) $(MFLAGS) -f ../Makefile \ - Makefile TOP=$$newtop CURRENT=$(DIR)$$i;\ - $(MAKE) $(MFLAGS) Makefiles.SH) \ + (cd $$i || exit 1; \ + if test -f Jmakefile; then \ + $(MAKE) $(MFLAGS) -f ../Makefile \ + Makefile TOP=$$newtop CURRENT=$(DIR)$$i && \ + $(MAKE) $(MFLAGS) Makefiles.SH; \ + fi; \ + ) || exit 1; \ done all:: @$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS= +local_install:: +local_deinstall:: +local_install.man:: +local_deinstall.man:: + !NO!SUBS! chmod 644 Makefile $eunicefix Makefile Modified: trunk/dist/mcon/Makefile.SH =================================================================== --- trunk/dist/mcon/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/mcon/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,6 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL55] -: $X-Id: Jmake.tmpl,v 3.0.1.2 1995/01/11 14:50:21 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ + case $CONFIG in '') if test -f config.sh; then TOP=.; @@ -40,8 +41,7 @@ # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags -MAKE = make -MKDEP = $mkdep \$(DPFLAGS) -- +JCPPFLAGS = $cppflags MV = $mv PRIVLIB = $installprivlib RM = $rm -f @@ -58,21 +58,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.3 1995/03/21 08:35:28 ram Exp ram $ -######################################################################## -# Force 'make depend' to be performed first -- do not edit +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ -.FORCE_DEPEND:: - -all:: .FORCE_DEPEND - ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0.1.4 1995/07/25 13:23:09 ram Exp ram $ +# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -114,55 +108,74 @@ /bin/sh makegloss.SH -install:: - @for dir in $(PRIVLIB) $(PRIVLIB)/U; do \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - (set -x; test -d $$dir || $(INSTALLDIR) $$dir); \ +local_install:: + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for dir in $(PRIVLIB) $(PRIVLIB)/U; do \ + (set -x; test -d $(INSTALL_PREFIX)$$dir || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$$dir); \ done -deinstall:: - $(RM) -r $(PRIVLIB) $(PRIVLIB)/U +local_deinstall:: + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for dir in $(PRIVLIB) $(PRIVLIB)/U; do \ + (set -x; test -d $$dir && $(RM) -r $(INSTALL_PREFIX)$$dir); \ + done -install:: Glossary - $(INSTALL) -c -m 444 Glossary $(PRIVLIB) +local_install:: Glossary + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \ + $(INSTALL) -c -m 444 Glossary $(INSTALL_PREFIX)$(PRIVLIB) -deinstall:: - $(RM) $(PRIVLIB)/Glossary +local_deinstall:: + $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/Glossary -install:: makegloss - $(INSTALL) -c -m 555 makegloss $(PRIVLIB) +local_install:: makegloss + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \ + $(INSTALL) -c -m 555 makegloss $(INSTALL_PREFIX)$(PRIVLIB) -deinstall:: - $(RM) $(PRIVLIB)/makegloss +local_deinstall:: + $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/makegloss -install:: configure - $(INSTALL) -c -m 555 configure $(PRIVLIB) +local_install:: configure + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \ + $(INSTALL) -c -m 555 configure $(INSTALL_PREFIX)$(PRIVLIB) -deinstall:: - $(RM) $(PRIVLIB)/configure +local_deinstall:: + $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/configure -install:: U/[a-d]*.U - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ +local_install:: U/[a-d]*.U + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/U || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/U); \ for i in U/[a-d]*.U; do \ - (set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)/U); \ + (set -x; $(INSTALL) -c -m 444 \ + $$i $(INSTALL_PREFIX)$(PRIVLIB)/U) || exit 1;\ done -deinstall:: +local_deinstall:: @case '${MFLAGS}' in *[i]*) set +e;; esac; \ for i in U/[a-d]*.U; do \ - (set -x; $(RM) $(PRIVLIB)/U/$$i); \ + (set -x; $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/U/$$i); \ done -install:: U/[A-Ze-z]*.U - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ +local_install:: U/[A-Ze-z]*.U + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/U || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/U); \ for i in U/[A-Ze-z]*.U; do \ - (set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)/U); \ + (set -x; $(INSTALL) -c -m 444 \ + $$i $(INSTALL_PREFIX)$(PRIVLIB)/U) || exit 1;\ done -deinstall:: +local_deinstall:: @case '${MFLAGS}' in *[i]*) set +e;; esac; \ for i in U/[A-Ze-z]*.U; do \ - (set -x; $(RM) $(PRIVLIB)/U/$$i); \ + (set -x; $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/U/$$i); \ done all:: metaconfig mconfig @@ -182,11 +195,14 @@ perl $(TOP)/bin/perload -o mconfig > $@ chmod +rx $@ -install:: metaconfig - $(INSTALL) -c -m 555 metaconfig $(SCRIPTDIR) +local_install:: metaconfig + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \ + $(INSTALL) -c -m 555 metaconfig $(INSTALL_PREFIX)$(SCRIPTDIR) -deinstall:: - $(RM) $(SCRIPTDIR)/metaconfig +local_deinstall:: + $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/metaconfig all:: metalint mlint @@ -205,11 +221,14 @@ perl $(TOP)/bin/perload -o mlint > $@ chmod +rx $@ -install:: metalint - $(INSTALL) -c -m 555 metalint $(SCRIPTDIR) +local_install:: metalint + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \ + $(INSTALL) -c -m 555 metalint $(INSTALL_PREFIX)$(SCRIPTDIR) -deinstall:: - $(RM) $(SCRIPTDIR)/metalint +local_deinstall:: + $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/metalint all:: metaxref mxref @@ -228,11 +247,14 @@ perl $(TOP)/bin/perload -o mxref > $@ chmod +rx $@ -install:: metaxref - $(INSTALL) -c -m 555 metaxref $(SCRIPTDIR) +local_install:: metaxref + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \ + $(INSTALL) -c -m 555 metaxref $(INSTALL_PREFIX)$(SCRIPTDIR) -deinstall:: - $(RM) $(SCRIPTDIR)/metaxref +local_deinstall:: + $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/metaxref BINFILES = \ mconfig \ @@ -256,29 +278,41 @@ ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: sub_clean local_clean realclean: sub_realclean local_realclean clobber: sub_clobber local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean local_clobber:: local_realclean $(RM) Makefile config.sh +install:: local_install sub_install +install.man:: maybe_install.man sub_install.man +deinstall:: sub_deinstall local_deinstall +deinstall.man:: sub_deinstall.man maybe_deinstall.man + +install.man-no: +deinstall.man-no: + +maybe_install.man: install.man-no +maybe_deinstall.man: deinstall.man-no + Makefile.SH: Jmakefile -@if test -f $(TOP)/.package; then \ - if test -f Makefile.SH; then \ - echo " $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \ - $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \ - fi; \ - echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ - $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ - else touch $@; exit 0; fi + if test -f Makefile.SH; then \ + echo " $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \ + $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \ + fi; \ + echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ + $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ + else touch $@; fi Makefile: Makefile.SH /bin/sh Makefile.SH @@ -297,21 +331,23 @@ @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ for i in $(SUBDIRS) ;\ do \ - (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \ - $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \ + (cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \ + $(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \ done -install:: +sub_install:: @$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS= -deinstall:: +sub_deinstall:: @$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS= + @echo "Back to $(CURRENT) for "deinstall... -install.man:: +sub_install.man:: @$(MAKE) subdirs TARGET=install.man VERB="Installing man pages" FLAGS= -deinstall.man:: +sub_deinstall.man:: @$(MAKE) subdirs TARGET=deinstall.man VERB="Deinstalling man pages" FLAGS= + @echo "Back to $(CURRENT) for "deinstall.man... sub_clean:: @$(MAKE) subdirs TARGET=clean VERB="Cleaning" FLAGS= @@ -329,49 +365,51 @@ @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ for i in $(SUBDIRS) ;\ do \ - (cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \ - $(MAKE) $(MFLAGS) tag); \ + (cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \ + $(MAKE) $(MFLAGS) tag) || exit 1; \ done Makefiles:: @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ for i in $(SUBDIRS);\ do \ - echo "Making "Makefiles" in $(DIR)$$i..."; \ - (cd $$i || exit 1; \ - if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \ - $(MAKE) $(MFLAGS) Makefiles) \ + echo "Making "Makefiles" in $(DIR)$$i..."; \ + (cd $$i || exit 1; \ + if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \ + $(MAKE) $(MFLAGS) Makefiles) || exit 1;\ done Makefiles.SH:: Makefile.SH @case '${MFLAGS}' in *[ik]*) set +e;; esac; \ for i in $(SUBDIRS);\ do \ - case "$(DIR)$$i/" in \ - */*/*/*/) newtop=../../../..;; \ - */*/*/) newtop=../../..;; \ - */*/) newtop=../..;; \ - */) newtop=..;; \ - esac; \ - case "$(TOP)" in \ - /*) newtop="$(TOP)" ;; \ - esac; \ - echo "Making Makefiles.SH in $(DIR)$$i..."; \ - (cd $$i || exit 1; $(MAKE) $(MFLAGS) -f ../Makefile \ - Makefile TOP=$$newtop CURRENT=$(DIR)$$i;\ - $(MAKE) $(MFLAGS) Makefiles.SH) \ + case "$(DIR)$$i/" in \ + */*/*/*/) newtop=../../../..;; \ + */*/*/) newtop=../../..;; \ + */*/) newtop=../..;; \ + */) newtop=..;; \ + esac; \ + case "$(TOP)" in \ + /*) newtop="$(TOP)" ;; \ + esac; \ + echo "Making Makefiles.SH in $(DIR)$$i..."; \ + (cd $$i || exit 1; \ + if test -f Jmakefile; then \ + $(MAKE) $(MFLAGS) -f ../Makefile \ + Makefile TOP=$$newtop CURRENT=$(DIR)$$i && \ + $(MAKE) $(MFLAGS) Makefiles.SH; \ + fi; \ + ) || exit 1; \ done all:: @$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS= -######################################################################## -# Dependencies generated by make depend -# DO NOT DELETE THIS LINE -- make depend relies on it +local_install:: +local_deinstall:: +local_install.man:: +local_deinstall.man:: -# Put nothing here or make depend will gobble it up -.FORCE_DEPEND:: - @echo "You must run 'make depend' in $(TOP) first."; exit 1 !NO!SUBS! chmod 644 Makefile $eunicefix Makefile Modified: trunk/dist/mcon/man/Makefile.SH =================================================================== --- trunk/dist/mcon/man/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/mcon/man/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,5 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44] -: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ case $CONFIG in '') @@ -22,6 +22,7 @@ echo "Extracting ${DIR}Makefile (with variable substitutions)" INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'` +INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'` DATE=`date` $spitshell >Makefile <<!GROK!THIS! @@ -34,14 +35,15 @@ CURRENT = $CURRENT DIR = $DIR INSTALL = $INSTALL +INSTALLDIR = $INSTALLDIR ######################################################################## # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags +JCPPFLAGS = $cppflags L = $manext MANSRC = $installmansrc -MAKE = make MV = $mv RM = $rm -f @@ -62,15 +64,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $ +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0 1993/08/18 12:10:13 ram Exp ram $ +# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -89,39 +91,60 @@ local_realclean:: $(RM) $(MPAGES) -install.man:: - @if test "$(MANSRC)"; then \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for file in $(MPAGES); do \ - (set -x; $(INSTALL) -c -m 444 $$file $(MANSRC)); \ - done; \ - else exit 0; fi +local_install.man:: + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \ + for file in $(MPAGES); do \ + (set -x; $(INSTALL) -c -m 444 $$file \ + $(INSTALL_PREFIX)$(MANSRC)) || exit 1; \ + done -deinstall.man:: - @if test "$(MANSRC)"; then \ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ - for file in $(MPAGES); do \ - (set -x; $(RM) $(MANSRC)/$$file); \ - done; \ - else exit 0; fi +local_deinstall.man:: + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + for file in $(MPAGES); do \ + (set -x; $(RM) $(INSTALL_PREFIX)$(MANSRC)/$$file); \ + done ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: local_clean realclean: local_realclean clobber: local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean local_clobber:: local_realclean $(RM) Makefile config.sh +install:: local_install +install.man:: maybe_install.man +deinstall:: local_deinstall +deinstall.man:: maybe_deinstall.man + +install.man-yes: local_install.man +install.man-no: +deinstall.man-yes: local_deinstall.man +deinstall.man-no: + +!NO!SUBS! +case "$installmansrc" in +'') man=no;; +*) man=yes;; +esac +$spitshell >>Makefile <<!GROK!THIS! +maybe_install.man: install.man-$man +maybe_deinstall.man: deinstall.man-$man +!GROK!THIS! +$spitshell >>Makefile <<'!NO!SUBS!' + Makefile.SH: Jmakefile -@if test -f $(TOP)/.package; then \ if test -f Makefile.SH; then \ @@ -130,7 +153,7 @@ fi; \ echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ - else touch $@; exit 0; fi + else touch $@; fi Makefile: Makefile.SH /bin/sh Makefile.SH @@ -145,16 +168,16 @@ ######################################################################## # Empty rules for directories with no sub-directories -- do not edit -install:: +local_install:: @echo "install in $(CURRENT) done." -deinstall:: +local_deinstall:: @echo "deinstall in $(CURRENT) done." -install.man:: +local_install.man:: @echo "install.man in $(CURRENT) done." -deinstall.man:: +local_deinstall.man:: @echo "deinstall.man in $(CURRENT) done." Makefiles:: Modified: trunk/dist/pat/Makefile.SH =================================================================== --- trunk/dist/pat/Makefile.SH 2006-08-25 22:31:50 UTC (rev 9) +++ trunk/dist/pat/Makefile.SH 2006-08-25 22:33:07 UTC (rev 10) @@ -1,5 +1,6 @@ -: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL55] -: $X-Id: Jmake.tmpl,v 3.0.1.2 1995/01/11 14:50:21 ram Exp ram $ +: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0] +: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $ + case $CONFIG in '') if test -f config.sh; then TOP=.; @@ -21,6 +22,7 @@ echo "Extracting ${DIR}Makefile (with variable substitutions)" INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'` +INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'` DATE=`date` $spitshell >Makefile <<!GROK!THIS! @@ -33,15 +35,15 @@ CURRENT = $CURRENT DIR = $DIR INSTALL = $INSTALL +INSTALLDIR = $INSTALLDIR ######################################################################## # Parameters set by Configure -- edit config.sh if changes are needed CTAGS = ctags +JCPPFLAGS = $cppflags L = $manext MANSRC = $installmansrc -MAKE = make -MKDEP = $mkdep \$(DPFLAGS) -- MV = $mv RM = $rm -f SCRIPTDIR = $installscript @@ -51,21 +53,15 @@ $spitshell >>Makefile <<'!NO!SUBS!' ######################################################################## # Jmake rules for building libraries, programs, scripts, and data files -# $X-Id: Jmake.rules,v 3.0.1.3 1995/03/21 08:35:28 ram Exp ram $ -######################################################################## -# Force 'make depend' to be performed first -- do not edit +# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $ -.FORCE_DEPEND:: - -all:: .FORCE_DEPEND - ######################################################################## # Start of Jmakefile -# $X-Id: Jmakefile,v 3.0.1.3 1995/07/24 09:57:21 ram Exp ram $ +# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $ # # Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi -# +# # You may redistribute only under the terms of the Artistic Licence, # as specified in the README file that comes with the distribution. # You may reuse parts of this distribution only within the terms of @@ -157,23 +153,29 @@ /bin/sh patlog.SH -install:: $(PAT) - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ +local_install:: $(PAT) + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \ for i in $(PAT); do \ - (set -x; $(INSTALL) -c -m 555 $$i $(SCRIPTDIR)); \ + (set -x; $(INSTALL) -c -m 555 \ + $$i $(INSTALL_PREFIX)$(SCRIPTDIR)) || exit 1;\ done -deinstall:: +local_deinstall:: @case '${MFLAGS}' in *[i]*) set +e;; esac; \ for i in $(PAT); do \ - (set -x; $(RM) $(SCRIPTDIR)/$$i); \ + (set -x; $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/$$i); \ done -install.man:: pat.man - $(INSTALL) -c -m 444 pat.man $(MANSRC)/pat.$(L) +local_install.man:: pat.man + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ + (set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \ + $(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \ + $(INSTALL) -c -m 444 pat.man $(INSTALL_PREFIX)$(MANSRC)/pat.$(L) -deinstall.man:: - $(RM) $(MANSRC)/pat.$(L) +local_deinstall.man:: + $(RM) $(INSTALL_PREFIX)$(MANSRC)/pat.$(L) PATSH = \ pat.SH \ @@ -204,29 +206,51 @@ ######################################################################## # Common rules for all Makefiles -- do not edit -emptyrule:: +all:: clean: local_clean realclean: local_realclean clobber: local_clobber local_clean:: - $(RM) core *~ *.o + if test -f core; then $(RM) core; fi + $(RM) *~ *.o local_realclean:: local_clean local_clobber:: local_realclean $(RM) Makefile config.sh +install:: local_install +install.man:: maybe_install.man +deinstall:: local_deinstall +deinstall.man:: maybe_deinstall.man + +install.man-yes: local_install.man +install.man-no: +deinstall.man-yes: local_deinstall.man +deinstall.man-no: + +!NO!SUBS! +case "$installmansrc" in +'') man=no;; +*) man=yes;; +esac +$spitshell >>Makefile <<!GROK!THIS! +maybe_install.man: install.man-$man +maybe_deinstall.man: deinstall.man-$man +!GROK!THIS! +$spitshell >>Makefile <<'!NO!SUBS!' + Makefile.SH: Jmakefile -@if test -f $(TOP)/.package; then \ - if test -f Makefile.SH; then \ - echo " $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \ - $(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \ - fi; \ - echo " $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \ - $(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \ - else touch $@; exit 0; fi + if test -f Makefile.SH; then \ + echo " $(RM) Makefile.SH~; ... [truncated message content] |
From: <rma...@us...> - 2006-08-25 22:32:12
|
Revision: 9 Author: rmanfredi Date: 2006-08-25 15:31:50 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=9&view=rev Log Message: ----------- Removed obsoleted ">VAR" lines requesting that the symbol be included. Jmake from 3.5 is now smart enough to figure this out by itself. Modified Paths: -------------- trunk/dist/Jmakefile trunk/dist/bin/Jmakefile trunk/dist/kit/Jmakefile trunk/dist/lib/C/fake/Jmakefile trunk/dist/mcon/Jmakefile trunk/dist/mcon/man/Jmakefile trunk/dist/pat/Jmakefile Modified: trunk/dist/Jmakefile =================================================================== --- trunk/dist/Jmakefile 2006-08-25 22:27:18 UTC (rev 8) +++ trunk/dist/Jmakefile 2006-08-25 22:31:50 UTC (rev 9) @@ -23,8 +23,6 @@ ;# Baseline for dist 3.0 netwide release. ;# ->MANSRC /* This should really become automated */ - all:: /* So that default target is not clobber! */ SetSubdirs(bin mcon jmake pat kit lib) Modified: trunk/dist/bin/Jmakefile =================================================================== --- trunk/dist/bin/Jmakefile 2006-08-25 22:27:18 UTC (rev 8) +++ trunk/dist/bin/Jmakefile 2006-08-25 22:31:50 UTC (rev 9) @@ -30,10 +30,6 @@ !f.SH \ -expand \\ ->SED ->RM ->MKDEP - depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(BINSH) | \ Modified: trunk/dist/kit/Jmakefile =================================================================== --- trunk/dist/kit/Jmakefile 2006-08-25 22:27:18 UTC (rev 8) +++ trunk/dist/kit/Jmakefile 2006-08-25 22:31:50 UTC (rev 9) @@ -34,10 +34,6 @@ !f.SH \ -expand \\ ->SED ->RM ->MKDEP - depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(SCRIPTSH) | \ Modified: trunk/dist/lib/C/fake/Jmakefile =================================================================== --- trunk/dist/lib/C/fake/Jmakefile 2006-08-25 22:27:18 UTC (rev 8) +++ trunk/dist/lib/C/fake/Jmakefile 2006-08-25 22:31:50 UTC (rev 9) @@ -23,7 +23,5 @@ all:: /* So that default make does not default to install */ ->PRIVLIB /* Grrr.. Have to let jmake know I need this */ - MakeDirectories(install,$(PRIVLIB)/lib/C/fake) InstallMultiple($(FILES),$(PRIVLIB)/lib/C/fake) Modified: trunk/dist/mcon/Jmakefile =================================================================== --- trunk/dist/mcon/Jmakefile 2006-08-25 22:27:18 UTC (rev 8) +++ trunk/dist/mcon/Jmakefile 2006-08-25 22:31:50 UTC (rev 9) @@ -38,9 +38,6 @@ SimpleShellScriptTarget(makegloss) ->PRIVLIB /* We need the privlib definition */ ->SCRIPTDIR /* As well as the script directory */ - MakeInstallDirectories($(PRIVLIB) $(PRIVLIB)/U) InstallNonExec(Glossary,$(PRIVLIB)) InstallScript(makegloss,$(PRIVLIB)) @@ -78,10 +75,6 @@ !f.SH \ -expand \\ ->SED ->RM ->MKDEP - depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(BINSH) | \ Modified: trunk/dist/mcon/man/Jmakefile =================================================================== --- trunk/dist/mcon/man/Jmakefile 2006-08-25 22:27:18 UTC (rev 8) +++ trunk/dist/mcon/man/Jmakefile 2006-08-25 22:31:50 UTC (rev 9) @@ -17,8 +17,6 @@ ;# Baseline for dist 3.0 netwide release. ;# ->L /* I expect to fix this with a |append command */ - MPAGES = metaconfig.$(L) metalint.$(L) metaxref.$(L) ComplexShellManualTarget($(MPAGES)) Modified: trunk/dist/pat/Jmakefile =================================================================== --- trunk/dist/pat/Jmakefile 2006-08-25 22:27:18 UTC (rev 8) +++ trunk/dist/pat/Jmakefile 2006-08-25 22:31:50 UTC (rev 9) @@ -42,9 +42,6 @@ NoManPages() /* There is a single man page for all tools */ SimpleShellScriptTarget($(PAT)) ->SCRIPTDIR /* Grrr... I have to find a nicer way!! */ ->MANSRC /* Idem!! */ - InstallMultipleFlags($(PAT),$(SCRIPTDIR),-m 555) InstallManPage(pat,$(MANSRC)) @@ -53,10 +50,6 @@ !f.SH \ -expand \\ ->SED ->RM ->MKDEP - depend:: ($(SED) '/^# DO NOT DELETE/q' Makefile && \ grep '^\$$grep' $(PATSH) | \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-25 22:27:44
|
Revision: 8 Author: rmanfredi Date: 2006-08-25 15:27:18 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=8&view=rev Log Message: ----------- Added keyword expansion. Modified Paths: -------------- trunk/dist/jmake/files/Jmake.rules trunk/dist/jmake/files/Jmake.tmpl Property Changed: ---------------- trunk/dist/jmake/files/Jmake.rules trunk/dist/jmake/files/Jmake.tmpl Modified: trunk/dist/jmake/files/Jmake.rules =================================================================== --- trunk/dist/jmake/files/Jmake.rules 2006-08-25 22:24:13 UTC (rev 7) +++ trunk/dist/jmake/files/Jmake.rules 2006-08-25 22:27:18 UTC (rev 8) @@ -1,12 +1,12 @@ ;######################################################################## ;# Jmake rules for building libraries, programs, scripts, and data files -;# $Id: Jmake.rules,v 3.0.1.7 2004/08/22 08:28:58 ram Exp ram $ +;# $Id$ /* * MACHINE-INDEPENDENT RULES -- DO NOT MODIFY */ -/* $Id: Jmake.rules,v 3.0.1.7 2004/08/22 08:28:58 ram Exp ram $ +/* $Id$ * * Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi * Property changes on: trunk/dist/jmake/files/Jmake.rules ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/jmake/files/Jmake.tmpl =================================================================== --- trunk/dist/jmake/files/Jmake.tmpl 2006-08-25 22:24:13 UTC (rev 7) +++ trunk/dist/jmake/files/Jmake.tmpl 2006-08-25 22:27:18 UTC (rev 8) @@ -1,7 +1,7 @@ /* * Generic jmake template * - * $Id: Jmake.tmpl,v 3.0.1.3 1997/02/28 14:56:16 ram Exp ram $ + * $Id$ * * Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi * @@ -27,7 +27,7 @@ */ : Makefile.SH generated from Jmake.tmpl and Jmakefile <TAG> -: $Id: Jmake.tmpl,v 3.0.1.3 1997/02/28 14:56:16 ram Exp ram $ +: $Id$ /************************************************************************* * * Property changes on: trunk/dist/jmake/files/Jmake.tmpl ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-25 22:24:30
|
Revision: 7 Author: rmanfredi Date: 2006-08-25 15:24:13 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=7&view=rev Log Message: ----------- InstallTarget() now uses :: targets. Default empty rule for all makefiles is now called "all" instead of "emptyrule" because if there is nothing to be done, GNU make prints the target name and "emptyrule" is not pretty. Modified Paths: -------------- trunk/dist/jmake/files/Jmake.rules trunk/dist/jmake/files/Jmake.tmpl Modified: trunk/dist/jmake/files/Jmake.rules =================================================================== --- trunk/dist/jmake/files/Jmake.rules 2006-08-25 22:21:46 UTC (rev 6) +++ trunk/dist/jmake/files/Jmake.rules 2006-08-25 22:24:13 UTC (rev 7) @@ -592,14 +592,14 @@ * Generate rules to recursively install files */ #define InstallTarget() @!\ -?SUBDIRS:install: local_install sub_install @!\ -%SUBDIRS:install: local_install @!\ -?SUBDIRS:install.man: maybe_install.man sub_install.man @!\ -%SUBDIRS:install.man: maybe_install.man @!\ -?SUBDIRS:deinstall: sub_deinstall local_deinstall @!\ -%SUBDIRS:deinstall: local_deinstall @!\ -?SUBDIRS:deinstall.man: sub_deinstall.man maybe_deinstall.man @!\ -%SUBDIRS:deinstall.man: maybe_deinstall.man @!\ +?SUBDIRS:install:: local_install sub_install @!\ +%SUBDIRS:install:: local_install @!\ +?SUBDIRS:install.man:: maybe_install.man sub_install.man @!\ +%SUBDIRS:install.man:: maybe_install.man @!\ +?SUBDIRS:deinstall:: sub_deinstall local_deinstall @!\ +%SUBDIRS:deinstall:: local_deinstall @!\ +?SUBDIRS:deinstall.man:: sub_deinstall.man maybe_deinstall.man @!\ +%SUBDIRS:deinstall.man:: maybe_deinstall.man @!\ @!\ ?MANSRC:install.man-yes: local_install.man @!\ install.man-no: @!\ Modified: trunk/dist/jmake/files/Jmake.tmpl =================================================================== --- trunk/dist/jmake/files/Jmake.tmpl 2006-08-25 22:21:46 UTC (rev 6) +++ trunk/dist/jmake/files/Jmake.tmpl 2006-08-25 22:24:13 UTC (rev 7) @@ -151,7 +151,7 @@ * These need to be here so that rules in Jmakefile occur first; the blank * all is to make sure that an empty Jmakefile doesn't default to make clean. */ -emptyrule:: +all:: CleanTarget() InstallTarget() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-25 22:22:31
|
Revision: 6 Author: rmanfredi Date: 2006-08-25 15:21:46 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=6&view=rev Log Message: ----------- Advertise SVN's repository for dist in every generated Configure script. Modified Paths: -------------- trunk/dist/mcon/U/Head.U Modified: trunk/dist/mcon/U/Head.U =================================================================== --- trunk/dist/mcon/U/Head.U 2006-08-25 22:09:39 UTC (rev 5) +++ trunk/dist/mcon/U/Head.U 2006-08-25 22:21:46 UTC (rev 6) @@ -77,8 +77,8 @@ ?X: # Note: this Configure script was generated automatically. Rather than # working with this copy of Configure, you may wish to get metaconfig. -# The dist package (which contains metaconfig) is available at -# http://sourceforge.net/projects/dist/ +# The dist package (which contains metaconfig) is available via SVN: +# svn co https://svn.sourceforge.net/svnroot/dist/trunk/dist ?X: ?X: NOTA BENE: ?X: If you develop you own version of metaconfig based on this work, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-25 22:10:47
|
Revision: 5 Author: rmanfredi Date: 2006-08-25 15:09:39 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=5&view=rev Log Message: ----------- Fixed Jmakefile: there's no need to request manual inclusion of symbols. The MakeDirectories() target was using @! instead of proper @@ terminator to introduce the commands. Modified Paths: -------------- trunk/dist/jmake/files/Jmake.rules trunk/dist/lib/Jmakefile Modified: trunk/dist/jmake/files/Jmake.rules =================================================================== --- trunk/dist/jmake/files/Jmake.rules 2006-08-25 21:54:31 UTC (rev 4) +++ trunk/dist/jmake/files/Jmake.rules 2006-08-25 22:09:39 UTC (rev 5) @@ -1328,7 +1328,7 @@ * Generate rules to create a hierarchy of directories. */ #define MakeDirectories(step,dirs) @!\ -step:: @!\ +step:: @@\ MakeDirs(dirs) Modified: trunk/dist/lib/Jmakefile =================================================================== --- trunk/dist/lib/Jmakefile 2006-08-25 21:54:31 UTC (rev 4) +++ trunk/dist/lib/Jmakefile 2006-08-25 22:09:39 UTC (rev 5) @@ -27,8 +27,6 @@ all:: /* So that default make does not default to install */ ->PRIVLIB /* Grrr.. Have to let jmake know I need this */ - MakeDirectories(install,$(PRIVLIB)/lib) InstallMultiple($(FILES),$(PRIVLIB)/lib) @@ -40,8 +38,6 @@ * file.SH. */ #define InstallSingleExt(step,file,dest,flags,old,new) @!\ ->INSTALL @!\ ->RM @!\ step:: file^^old @@\ @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ (set -x; $(INSTALL) -c flags file^^old dest/file^^new) @@\ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-25 21:54:41
|
Revision: 4 Author: rmanfredi Date: 2006-08-25 14:54:31 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=4&view=rev Log Message: ----------- Let metaconfig use the MANIFEST file if there is no MANIFEST.new. The MANIFEST.new file is necessary when using the "pat" tools, but not when running metaconfig by itself. Modified Paths: -------------- trunk/dist/mcon/man/mconfig.SH trunk/dist/mcon/mconfig.SH Modified: trunk/dist/mcon/man/mconfig.SH =================================================================== --- trunk/dist/mcon/man/mconfig.SH 2006-08-25 21:39:07 UTC (rev 3) +++ trunk/dist/mcon/man/mconfig.SH 2006-08-25 21:54:31 UTC (rev 4) @@ -159,7 +159,8 @@ .IP \(bu Create a MANIFEST.new file in your top level directory that lists all the files in your package. This file will remain private and will not be -part of the final distribution. +part of the final distribution. (As a convenience, the MANIFEST file will +be used by \fImetaconfig\fR if there is no MANIFEST.new file yet.) The filename should be the first field on each line. After some whitespace you can add a short comment describing your file. Only source files should be listed in there. The special file @@ -972,6 +973,11 @@ files. If you intend to write new units, you should have a good understanding of the whole scheme. .PP +If there is no MANIFEST.new file, \fImetaconfig\fR will try to use the +MANIFEST file instead, for convenience. Everywhere we mention MANIFEST.new, +it can be understood as MANIFEST provided there is no MANIFEST.new file +found at the root of your package. +.PP Assuming your MANIFEST.new file is properly set and lists all the source files you wish to configure, and that you have run \fIpackint\fR in your root source directory to create a \fI.package\fR file, you may run Modified: trunk/dist/mcon/mconfig.SH =================================================================== --- trunk/dist/mcon/mconfig.SH 2006-08-25 21:39:07 UTC (rev 3) +++ trunk/dist/mcon/mconfig.SH 2006-08-25 21:54:31 UTC (rev 4) @@ -119,6 +119,11 @@ sub init_constants { $NEWMANI = 'MANIFEST.new'; # List of files to be scanned $MANI = 'MANIFEST'; # For manifake + + # The distinction between MANIFEST.new and MANIFEST can make sense + # when the "pat" tools are used, but if only metaconfig is used, then + # we can very well leave without a MANIFEST.new. --RAM, 2006-08-25 + $NEWMANI = $MANI if -f $MANI && ! -f $NEWMANI; } # Record the exceptions -- almost all symbols but these are lower case This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-25 21:40:43
|
Revision: 3 Author: rmanfredi Date: 2006-08-25 14:39:07 -0700 (Fri, 25 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=3&view=rev Log Message: ----------- Added keyword substitution property. Modified Paths: -------------- trunk/dist/Jmakefile trunk/dist/bin/Jmakefile trunk/dist/bin/manicheck.man trunk/dist/bin/manilist.man trunk/dist/bin/packinit.man trunk/dist/dist.man trunk/dist/jmake/Jmakefile trunk/dist/jmake/jmake.man trunk/dist/jmake/jmkmf.man trunk/dist/kit/Jmakefile trunk/dist/kit/kitpost.man trunk/dist/kit/kitsend.man trunk/dist/kit/makeSH.man trunk/dist/kit/makedist.man trunk/dist/kit/manifake.man trunk/dist/lib/C/Jmakefile trunk/dist/lib/C/fake/Jmakefile trunk/dist/lib/Jmakefile trunk/dist/mcon/Jmakefile trunk/dist/mcon/man/Jmakefile trunk/dist/pat/Jmakefile trunk/dist/pat/pat.man Property Changed: ---------------- trunk/dist/Jmakefile trunk/dist/bin/Jmakefile trunk/dist/bin/manicheck.man trunk/dist/bin/manilist.man trunk/dist/bin/packinit.man trunk/dist/dist.man trunk/dist/jmake/Jmakefile trunk/dist/jmake/jmake.man trunk/dist/jmake/jmkmf.man trunk/dist/kit/Jmakefile trunk/dist/kit/kitpost.man trunk/dist/kit/kitsend.man trunk/dist/kit/makeSH.man trunk/dist/kit/makedist.man trunk/dist/kit/manifake.man trunk/dist/lib/C/Jmakefile trunk/dist/lib/C/fake/Jmakefile trunk/dist/lib/Jmakefile trunk/dist/mcon/Jmakefile trunk/dist/mcon/man/Jmakefile trunk/dist/pat/Jmakefile trunk/dist/pat/pat.man Modified: trunk/dist/Jmakefile =================================================================== --- trunk/dist/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Main Jmakefile for dist 3.0 */ -;# $Id: Jmakefile,v 3.0.1.2 1995/07/25 13:29:41 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/bin/Jmakefile =================================================================== --- trunk/dist/bin/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/bin/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Jmakefile for bin subdirectory. */ -;# $Id: Jmakefile,v 3.0.1.1 1994/01/24 13:42:53 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/bin/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/bin/manicheck.man =================================================================== --- trunk/dist/bin/manicheck.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/bin/manicheck.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: manicheck.man,v 3.0 1993/08/18 12:04:02 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/bin/manicheck.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/bin/manilist.man =================================================================== --- trunk/dist/bin/manilist.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/bin/manilist.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: manilist.man,v 3.0.1.3 1995/05/12 11:57:31 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/bin/manilist.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/bin/packinit.man =================================================================== --- trunk/dist/bin/packinit.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/bin/packinit.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: packinit.man,v 3.0.1.4 1995/07/25 13:31:38 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/bin/packinit.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/dist.man =================================================================== --- trunk/dist/dist.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/dist.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: dist.man,v 3.0.1.6 1995/05/12 11:57:53 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/dist.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/jmake/Jmakefile =================================================================== --- trunk/dist/jmake/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/jmake/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Jmakefile for jmake */ -;# $Id: Jmakefile,v 3.0.1.2 1995/03/21 08:34:16 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/jmake/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/jmake/jmake.man =================================================================== --- trunk/dist/jmake/jmake.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/jmake/jmake.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: jmake.man,v 3.0.1.3 2004/08/22 09:01:55 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/jmake/jmake.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/jmake/jmkmf.man =================================================================== --- trunk/dist/jmake/jmkmf.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/jmake/jmkmf.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: jmkmf.man,v 3.0.1.1 1995/05/12 11:58:03 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/jmake/jmkmf.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/kit/Jmakefile =================================================================== --- trunk/dist/kit/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/kit/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Jmakefile for kit maker */ -;# $Id: Jmakefile,v 3.0.1.2 1994/04/22 09:35:35 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/kit/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/kit/kitpost.man =================================================================== --- trunk/dist/kit/kitpost.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/kit/kitpost.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: kitpost.man,v 3.0.1.2 1995/05/12 11:58:09 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/kit/kitpost.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/kit/kitsend.man =================================================================== --- trunk/dist/kit/kitsend.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/kit/kitsend.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: kitsend.man,v 3.0.1.1 1994/05/06 14:00:11 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/kit/kitsend.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/kit/makeSH.man =================================================================== --- trunk/dist/kit/makeSH.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/kit/makeSH.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: makeSH.man,v 3.0 1993/08/18 12:04:27 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/kit/makeSH.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/kit/makedist.man =================================================================== --- trunk/dist/kit/makedist.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/kit/makedist.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,5 +1,5 @@ .rn '' }` -''' $Id: makedist.man,v 3.0.1.2 1995/05/12 11:58:16 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/kit/makedist.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/kit/manifake.man =================================================================== --- trunk/dist/kit/manifake.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/kit/manifake.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,4 +1,4 @@ -''' $Id: manifake.man,v 3.0.1.1 1995/05/12 11:58:21 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/kit/manifake.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/lib/C/Jmakefile =================================================================== --- trunk/dist/lib/C/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/lib/C/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Jmakefile for C subdirectory. */ -;# $Id: Jmakefile,v 3.0.1.1 1994/01/24 13:43:38 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/lib/C/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/lib/C/fake/Jmakefile =================================================================== --- trunk/dist/lib/C/fake/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/lib/C/fake/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Jmakefile for C/fake subdirectory. */ -;# $Id: Jmakefile,v 3.0.1.1 1994/01/24 13:43:44 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/lib/C/fake/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/lib/Jmakefile =================================================================== --- trunk/dist/lib/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/lib/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Jmakefile for lib subdirectory. */ -;# $Id: Jmakefile,v 3.0.1.1 1994/01/24 13:43:31 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/lib/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/mcon/Jmakefile =================================================================== --- trunk/dist/mcon/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/mcon/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Jmakefile for metaconfig */ -;# $Id: Jmakefile,v 3.0.1.4 1995/07/25 13:23:09 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/mcon/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/mcon/man/Jmakefile =================================================================== --- trunk/dist/mcon/man/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/mcon/man/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Jmakefile for metaconfig manual pages */ -;# $Id: Jmakefile,v 3.0 1993/08/18 12:10:13 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/mcon/man/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/pat/Jmakefile =================================================================== --- trunk/dist/pat/Jmakefile 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/pat/Jmakefile 2006-08-25 21:39:07 UTC (rev 3) @@ -2,7 +2,7 @@ * Jmakefile for patching tools. */ -;# $Id: Jmakefile,v 3.0.1.3 1995/07/24 09:57:21 ram Exp ram $ +;# $Id$ ;# ;# Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ;# Property changes on: trunk/dist/pat/Jmakefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Modified: trunk/dist/pat/pat.man =================================================================== --- trunk/dist/pat/pat.man 2006-08-24 18:22:11 UTC (rev 2) +++ trunk/dist/pat/pat.man 2006-08-25 21:39:07 UTC (rev 3) @@ -1,5 +1,5 @@ .rn '' }` -''' $Id: pat.man,v 3.0.1.7 1997/02/28 16:32:45 ram Exp ram $ +''' $Id$ ''' ''' Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi ''' Property changes on: trunk/dist/pat/pat.man ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rma...@us...> - 2006-08-24 18:22:21
|
Revision: 2 Author: rmanfredi Date: 2006-08-24 11:22:11 -0700 (Thu, 24 Aug 2006) ViewCVS: http://svn.sourceforge.net/dist/?rev=2&view=rev Log Message: ----------- Updated copyright date. Modified Paths: -------------- trunk/dist/README Modified: trunk/dist/README =================================================================== --- trunk/dist/README 2006-08-24 12:32:52 UTC (rev 1) +++ trunk/dist/README 2006-08-24 18:22:11 UTC (rev 2) @@ -4,7 +4,7 @@ Copyright (c) 1988, Larry Wall Copyright (c) 1990-1992, Harlan Stenn Copyright (c) 1991-1997, Raphael Manfredi - Copyright (c) 2004-2005, Raphael Manfredi + Copyright (c) 2004-2006, Raphael Manfredi ------------------------------------------------------------------------ This program is free software; you can redistribute it and/or modify This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |