Several people have spotted an uninitialised structure member leading to a

[u/mdw/putty] / mkfiles.pl

diff --git a/mkfiles.pl b/mkfiles.pl
index c4760b8..835a940 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -935,25 +935,27 @@ if (defined $makefiles{'gtk'}) {
     "\n".
     "-include Makefile.local\n".
     "\n".
+    "unexport CFLAGS # work around a weird issue with krb5-config\n".
+    "\n".
     &splitline("CFLAGS = -O2 -Wall -Werror -g " .
               (join " ", map {"-I$dirpfx$_"} @srcdirs) .
-              " `\$(GTK_CONFIG) --cflags`").
+              " \$(shell \$(GTK_CONFIG) --cflags)").
                 " -D _FILE_OFFSET_BITS=64\n".
-    "XLDFLAGS = \$(LDFLAGS) `\$(GTK_CONFIG) --libs`\n".
+    "XLDFLAGS = \$(LDFLAGS) \$(shell \$(GTK_CONFIG) --libs)\n".
     "ULDFLAGS = \$(LDFLAGS)\n".
     "ifeq (,\$(findstring NO_GSSAPI,\$(COMPAT)))\n".
-    "CFLAGS+= `\$(KRB5CONFIG) --cflags gssapi`\n".
-    "XLDFLAGS+= `\$(KRB5CONFIG) --libs gssapi`\n".
-    "ULDFLAGS = `\$(KRB5CONFIG) --libs gssapi`\n".
-    "endif\n";
-    "INSTALL=install\n",
-    "INSTALL_PROGRAM=\$(INSTALL)\n",
-    "INSTALL_DATA=\$(INSTALL)\n",
-    "prefix=/usr/local\n",
-    "exec_prefix=\$(prefix)\n",
-    "bindir=\$(exec_prefix)/bin\n",
-    "mandir=\$(prefix)/man\n",
-    "man1dir=\$(mandir)/man1\n",
+    "CFLAGS+= \$(shell \$(KRB5CONFIG) --cflags gssapi)\n".
+    "XLDFLAGS+= \$(shell \$(KRB5CONFIG) --libs gssapi)\n".
+    "ULDFLAGS = \$(shell \$(KRB5CONFIG) --libs gssapi)\n".
+    "endif\n".
+    "INSTALL=install\n".
+    "INSTALL_PROGRAM=\$(INSTALL)\n".
+    "INSTALL_DATA=\$(INSTALL)\n".
+    "prefix=/usr/local\n".
+    "exec_prefix=\$(prefix)\n".
+    "bindir=\$(exec_prefix)/bin\n".
+    "mandir=\$(prefix)/man\n".
+    "man1dir=\$(mandir)/man1\n".
     "\n".
     $makefile_extra{'gtk'}->{'vars'} .
     "\n".
@@ -1007,14 +1009,14 @@ if (defined $makefiles{'ac'}) {
               (join " ", map {"-I$dirpfx$_"} @srcdirs))."\n".
     "XLDFLAGS = \@LDFLAGS\@ \@LIBS\@ \@GTK_LIBS\@\n".
     "ULDFLAGS = \@LDFLAGS\@ \@LIBS\@\n".
-    "INSTALL=\@INSTALL\@\n",
-    "INSTALL_PROGRAM=\$(INSTALL)\n",
-    "INSTALL_DATA=\$(INSTALL)\n",
-    "prefix=\@prefix\@\n",
-    "exec_prefix=\@exec_prefix\@\n",
-    "bindir=\@bindir\@\n",
-    "mandir=\@mandir\@\n",
-    "man1dir=\$(mandir)/man1\n",
+    "INSTALL=\@INSTALL\@\n".
+    "INSTALL_PROGRAM=\$(INSTALL)\n".
+    "INSTALL_DATA=\$(INSTALL)\n".
+    "prefix=\@prefix\@\n".
+    "exec_prefix=\@exec_prefix\@\n".
+    "bindir=\@bindir\@\n".
+    "mandir=\@mandir\@\n".
+    "man1dir=\$(mandir)/man1\n".
     "\n".
     $makefile_extra{'gtk'}->{'vars'} .
     "\n".
@@ -1046,6 +1048,9 @@ if (defined $makefiles{'ac'}) {
     print $makefile_extra{'gtk'}->{'end'};
     print "\nclean:\n".
     "\trm -f *.o". (join "", map { " $_" } &progrealnames("X:U")) . "\n";
+    print "\ndistclean: clean\n".
+    "\t". &splitline("rm -f config.status config.cache config.log ".
+                    "configure.lineno config.status.lineno Makefile") . "\n";
     print "\nFORCE:\n";
     select STDOUT; close OUT;
 }