From 1ccdd5f18672bc47517b020a1c65d861351fcfdd Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Mon, 6 Jan 2020 10:28:28 +0000
Subject: Don't assume/set LDFLAGS being "", it could be set on the "configure"
 command-line. Remove "test-packages" test-target (which doesn't exist), but
 add "test-tcl" being the same as "test".

---
 unix/Makefile.in | 21 ++++++++++++++++++++-
 unix/configure   |  1 -
 unix/tcl.m4      |  4 +---
 win/Makefile.in  |  2 +-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index ea89d11..f314862 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -601,7 +601,9 @@ tcltest-real:
 # tcltest, ie:
 #	% make test TESTFLAGS="-verbose bps -file fileName.test"
 
-test: tcltest@EXEEXT@
+test: test-tcl
+
+test-tcl: tcltest@EXEEXT@
 	@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \
 	TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
 	./tcltest@EXEEXT@ $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
@@ -1862,4 +1864,21 @@ package-generate:
 	rm -rf $(PACKAGE)
 
 #--------------------------------------------------------------------------
+# The list of all the targets that do not correspond to real files. This stops
+# 'make' from getting confused when someone makes an error in a rule.
+#--------------------------------------------------------------------------
+
+.PHONY: all binaries libraries objs doc html html-tcl html-tk test runtest
+.PHONY: install install-strip install-binaries install-libraries
+.PHONY: install-headers install-private-headers install-doc
+.PHONY: clean distclean depend genstubs checkstubs checkexports checkuchar
+.PHONY: shell gdb valgrind valgrindshell dist alldist rpm
+.PHONY: tclLibObjs tcltest-real test-tcl gdb-test ro-test trace-test xttest
+.PHONY: topDirName gendate gentommath_h trace-shell checkdoc
+.PHONY: install-tzdata install-msgs
+.PHONY: packages configure-packages test-packages clean-packages
+.PHONY: dist-packages distclean-packages install-packages
+.PHONY: install-libraries-zipfs-shared install-libraries-zipfs-static tclzipfile
+
+#--------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/unix/configure b/unix/configure
index 3cfc79f..a84226f 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7657,7 +7657,6 @@ fi
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    LDFLAGS=""
 	    if test $doRpath = yes; then
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 932b0ad..75608b5 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1507,7 +1507,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		# Step 4 will set the necessary variables
 		DL_OBJS=""
 		SHLIB_LD_LIBS=""
-		LDFLAGS=""
 		;;
 	    *)
 		case "$arch" in
@@ -1526,7 +1525,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
+		LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
 		;;
 	    esac
 	    case "$arch" in
@@ -1576,7 +1575,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    LDFLAGS=""
 	    AS_IF([test $doRpath = yes], [
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
diff --git a/win/Makefile.in b/win/Makefile.in
index 768711a..47a754d 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -716,7 +716,7 @@ install-private-headers: libraries
 # tcltest, i.e.:
 #	% make test TESTFLAGS="-verbose bps -file fileName.test"
 
-test: test-tcl test-packages
+test: test-tcl
 
 test-tcl: tcltest
 	TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \
-- 
cgit v0.12