use FileHandle;
-open IN, "Recipe" or die "unable to open Recipe file\n";
+open IN, "Recipe" or do {
+ # We want to deal correctly with being run from one of the
+ # subdirs in the source tree. So if we can't find Recipe here,
+ # try one level up.
+ chdir "..";
+ open IN, "Recipe" or die "unable to open Recipe file\n";
+};
# HACK: One of the source files in `charset' is auto-generated by
# sbcsgen.pl. We need to generate that _now_, before attempting
"# RCINC = --include-dir c:\\cygwin\\include\\\n".
"\n".
&splitline("CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT".
- " -DNO_SECURITY -D_NO_OLDNAMES -DNO_MULTIMON -I.")."\n".
+ " -D_NO_OLDNAMES -DNO_MULTIMON -I.")."\n".
"LDFLAGS = -mno-cygwin -s\n".
&splitline("RCFLAGS = \$(RCINC) --define WIN32=1 --define _WIN32=1".
" --define WINVER=0x0400 --define MINGW32_FIX=1")."\n".
"# TOOLPATH = /opt/gcc/bin\n".
"CC = \$(TOOLPATH)cc\n".
"\n".
-&splitline("CFLAGS = -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
+&splitline("CFLAGS = -O2 -Wall -Werror -g -I. -I.. -I../charset `gtk-config --cflags`")."\n".
"XLDFLAGS = `gtk-config --libs`\n".
"ULDFLAGS =#\n".
"INSTALL=install\n",
"\trm -f *.o". (join "", map { " $_" } &progrealnames("XU")) . "\n".
"\n",
"install:\n",
-map("\t\$(INSTALL_PROGRAM) -m 755 $_ \$(bindir)/$_\n", &progrealnames("XU")),
-map("\t\$(INSTALL_DATA) -m 644 $_ \$(man1dir)/$_\n", &manpages("XU", "1")),
+map("\t\$(INSTALL_PROGRAM) -m 755 $_ \$(DESTDIR)\$(bindir)/$_\n", &progrealnames("XU")),
+map("\t\$(INSTALL_DATA) -m 644 $_ \$(DESTDIR)\$(man1dir)/$_\n", &manpages("XU", "1")),
"\n",
"install-strip:\n",
"\t\$(MAKE) install INSTALL_PROGRAM=\"\$(INSTALL_PROGRAM) -s\"\n",
Link_PPC = PPCLink
Link_Carbon = PPCLink
-LinkOptions = -c 'pTTY' -fragname PuTTY
+LinkOptions = -c 'pTTY'
LinkOptions_68K = {LinkOptions} -br 68k -model far -compact
LinkOptions_CFM68K = {LinkOptions} -br 020 -model cfmseg -compact
LinkOptions_PPC = {LinkOptions}
$rsrc = &objects($p, "", "X.rsrc", undef);
- foreach $arch qw(68K CFM68K PPC Carbon) {
+ foreach $arch (qw(68K CFM68K PPC Carbon)) {
$objstr = &objects($p, "X.\L$arch\E.o", "", undef);
print &splitline("$prog.\L$arch\E \xc4 $objstr $rsrc", undef, "\xb6");
print "\n";
print &splitline("\tDuplicate -y $rsrc {Targ}", 69, "\xb6"), "\n";
- print &splitline("\t{Link_$arch} -o {Targ} {LinkOptions_$arch} " .
+ print &splitline("\t{Link_$arch} -o {Targ} -fragname $prog " .
+ "{LinkOptions_$arch} " .
$objstr . " {Libs_$arch}", 69, "\xb6"), "\n";
print &splitline("\tSetFile -a BMi {Targ}", 69, "\xb6"), "\n\n";
}
undef, "\xb6"), "\n";
print "\tRez ", $d->{deps}->[0], " -o {Targ} {ROptions}\n\n";
}
-foreach $arch qw(68K CFM68K) {
+foreach $arch (qw(68K CFM68K)) {
foreach $d (&deps("X.\L$arch\E.o", "", "::", ":")) {
next unless $d->{obj};
print &splitline(sprintf("%s \xc4 %s", $d->{obj},
" -o {Targ} {COptions_$arch}\n\n";
}
}
-foreach $arch qw(PPC Carbon) {
+foreach $arch (qw(PPC Carbon)) {
foreach $d (&deps("X.\L$arch\E.o", "", "::", ":")) {
next unless $d->{obj};
print &splitline(sprintf("%s \xc4 %s", $d->{obj},