--- toast 2006/12/12 00:48:19 1.434 +++ toast 2006/12/12 02:31:42 1.435 @@ -3,7 +3,7 @@ ############################################################################## # # # This entire file is toast, a program for installing and managing software. # -# Copyright (C) 2003-2005 Jacques Frechet. # +# Copyright (C) 2003-2006 Jacques Frechet. # # Note that this file contains Version 2 of the GNU General Public License, # # which includes its own copyright notice. # # # @@ -43,7 +43,7 @@ my($myname, $myversion, $mytimestamp, $myauthor) = ($1, $2, $3, $4); $myversion .= "+" if $5; # if this version may contain changes not in RCS my($myurl) = "http://www.toastball.net/toast/"; -my($mycopyright) = "Copyright (C) 2003-2005 Jacques Frechet"; +my($mycopyright) = "Copyright (C) 2003-2006 Jacques Frechet"; my($genby) = "generated by $myname version $myversion [$myurl]"; $myname eq "toast" && $myauthor eq "zaphod" || die; # avoid accidents w/ CVS @@ -304,6 +304,7 @@ "showurls" => "true", "showopts" => "true", "infodir" => "true", + "infodiropt" => "--dir-file=", "xmlcatalog" => "true", "hspkg" => "false", "protect" => "false", @@ -4429,7 +4430,7 @@ { return true if m!(/dir|\Q$tmpsuffix\E|\Q$offsuffix\E|-\d+(\.info)?)$!; safechmod(0777, $dir); - optrun("install-info", $_, $tmpfile); + optrun("install-info", $_, infodiropt . $tmpfile); true; } $dir; mv($tmpfile, $dirfile) if -e($tmpfile); @@ -7076,6 +7077,15 @@ never be necessary; if you find a package that won't build without it, please send me a bug report! Default: empty string. +=item B<--infodiropt=>I<STRING> + +When the B<infodir> option is enabled, B<toast arm> and B<toast disarm> +will prepend I<STRING> to the C<install-info> command's second argument, +which is the full path of the file to be created or updated, and not +(for example) the directory containing that file. See the B<infodir> +option for details. Previous versions of B<toast> used the empty string. +Default: C<--dir-file=>. + =item S<B<--quiet> | B<--noquiet>> When B<quiet> is enabled, most commands will produce output only on @@ -7597,7 +7607,7 @@ =head1 COPYRIGHT -This manual is part of B<toast>. Copyright (C) 2003-2005 Jacques Frechet. +This manual is part of B<toast>. Copyright (C) 2003-2006 Jacques Frechet. B<toast> is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the