summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2004-09-23 20:04:06 (GMT)
committermdejong <mdejong>2004-09-23 20:04:06 (GMT)
commitc36a55ff0083738d8bd88d1ba5c164046e441f8f (patch)
tree8f926cc39cfa406f7de49c94d52bc89738eb6e53
parent198108e14897c176e8c959e0b17b298283a2fc73 (diff)
downloadtcl-c36a55ff0083738d8bd88d1ba5c164046e441f8f.zip
tcl-c36a55ff0083738d8bd88d1ba5c164046e441f8f.tar.gz
tcl-c36a55ff0083738d8bd88d1ba5c164046e441f8f.tar.bz2
* unix/dltest/Makefile.in (clean): Fixup make clean
rule so that it does not delete all files when SHLIB_SUFFIX is set to the empty string in a static build. [Bug 1016726]
-rw-r--r--ChangeLog7
-rw-r--r--unix/dltest/Makefile.in8
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7298a82..d1de167 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-23 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/dltest/Makefile.in (clean): Fixup make clean
+ rule so that it does not delete all files when
+ SHLIB_SUFFIX is set to the empty string in a static build.
+ [Bug 1016726]
+
2004-09-18 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* generic/tclExecute.c (TEBC-INST_LSHIFT,INST_RSHIFT): Ensure that
diff --git a/unix/dltest/Makefile.in b/unix/dltest/Makefile.in
index 98e60b3..64a60f8 100644
--- a/unix/dltest/Makefile.in
+++ b/unix/dltest/Makefile.in
@@ -1,7 +1,7 @@
# This Makefile is used to create several test cases for Tcl's load
# command. It also illustrates how to take advantage of configuration
# exported by Tcl to set up Makefiles for shared libraries.
-# RCS: @(#) $Id: Makefile.in,v 1.11.2.1 2004/07/20 11:13:10 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.11.2.2 2004/09/23 20:04:07 mdejong Exp $
TCL_DBGX = @TCL_DBGX@
CC = @CC@
@@ -45,8 +45,12 @@ pkge${SHLIB_SUFFIX}: $(SRC_DIR)/pkge.c
${SHLIB_LD} -o pkge${SHLIB_SUFFIX} pkge.o ${SHLIB_LD_LIBS}
clean:
- rm -f *.o *${SHLIB_SUFFIX} config.cache config.log config.status
+ rm -f *.o config.cache config.log config.status
rm -f lib.exp ../dltest.marker
+ @if test "$(SHLIB_SUFFIX)" != ""; then \
+ echo "rm -f *${SHLIB_SUFFIX}" ; \
+ rm -f *${SHLIB_SUFFIX} ; \
+ fi
distclean: clean
rm -f Makefile