nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 17:38:00 +00:00
Code Issues Projects Releases Wiki Activity

Add a -U option to mkfiles.pl, which is just like -u except that it

Browse Source 
runs configure at the top level rather than the unix subdirectory. I'm
getting into the idea of even doing it that way myself, because then I
can do VPATH builds from the same source tree elsewhere.

(Autoconf seems to be fine with doing multiple VPATH builds from the
same source tree in different build directories, but gets upset if you
try to do a VPATH build when you've done a normal build in the real
configure directory. So this way I do what autoconf sees as _only_
VPATH builds.)

[originally from svn r9269]
This commit is contained in:
Simon Tatham 2011-08-20 07:56:19 +00:00
parent e35feee639
commit 5a2e957525
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mkfiles.pl
View File

@ -20,16 +20,19 @@ use FileHandle;
use File::Basename;
use Cwd;
if ($#ARGV >= 0 and $ARGV[0] eq "-u") {
if ($#ARGV >= 0 and ($ARGV[0] eq "-u" or $ARGV[0] eq "-U")) {
# Convenience for Unix users: -u means that after we finish what
# we're doing here, we also run mkauto.sh and then 'configure' in
# the Unix subdirectory. So it's a one-stop shop for regenerating
# the actual end-product Unix makefile.
#
# Arguments supplied after -u go to configure.
#
# -U is identical, but runs 'configure' at the _top_ level, for
# people who habitually do that.
$do_unix = ($ARGV[0] eq "-U" ? 2 : 1);
shift @ARGV;
@confargs = @ARGV;
$do_unix = 1;
}
open IN, "Recipe" or do {
@ -1539,8 +1542,10 @@ if ($do_unix) {
chdir $orig_dir;
system "./mkauto.sh";
die "mkfiles.pl: mkauto.sh returned $?\n" if $? > 0;
chdir ($targetdir = dirname($makefiles{"am"}))
or die "$targetdir: chdir: $!\n";
if ($do_unix == 1) {
chdir ($targetdir = dirname($makefiles{"am"}))
or die "$targetdir: chdir: $!\n";
}
system "./configure", @confargs;
die "mkfiles.pl: configure returned $?\n" if $? > 0;
}