# HG changeset patch
# User Rik <rik@octave.org>
# Date 1601333030 25200
# Node ID bf427855cc9a661c940839440bbe4630bcfd4717
# Parent  83d1852eb0e63c5a01a84e0bbe5794d52d0eead0
Change mkoctfile to print a usable default LDFLAGS on Windows platforms (bug #59173).

* mkoctfile.in.cc: Re-arrange code for DEFAULT_INCFLAGS to clarify pattern.
Change LDFLAGS code to use either the environment variable (first choice) or
DEFAULT_LDFLAGS variable.

diff -r 83d1852eb0e6 -r bf427855cc9a src/mkoctfile.in.cc
--- a/src/mkoctfile.in.cc	Wed Sep 30 08:36:21 2020 +0200
+++ b/src/mkoctfile.in.cc	Mon Sep 28 15:43:50 2020 -0700
@@ -213,14 +213,14 @@
     = get_variable ("OCTLIBDIR",
                     prepend_octave_exec_home (%OCTAVE_CONF_OCTLIBDIR%));
 
+  std::string DEFAULT_INCFLAGS;
+
 #if defined (OCTAVE_USE_WINDOWS_API)
-  std::string DEFAULT_INCFLAGS
-    = "-I" + quote_path (vars["OCTINCLUDEDIR"] + R"(\..)")
-      + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
+  DEFAULT_INCFLAGS = "-I" + quote_path (vars["OCTINCLUDEDIR"] + R"(\..)")
+                     + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
 #else
-  std::string DEFAULT_INCFLAGS
-    = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..")
-      + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
+  DEFAULT_INCFLAGS = "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..")
+                     + " -I" + quote_path (vars["OCTINCLUDEDIR"]);
 #endif
 
   if (vars["INCLUDEDIR"] != "/usr/include")
@@ -320,7 +320,7 @@
   vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS",
                                         %OCTAVE_CONF_OCT_LINK_OPTS%);
 
-  vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%);
+  vars["LDFLAGS"] = get_variable ("LDFLAGS", DEFAULT_LDFLAGS);
 
   vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG",
                                          %OCTAVE_CONF_LD_STATIC_FLAG%);