merge trunk

1 files changed, 13 insertions, 38 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 500d872..2283c0b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.306.2.5 2010/12/01 16:42:37 kennykb Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.315 2010/12/17 23:49:37 stwo Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -260,7 +260,6 @@ INSTALL_TZDATA		= @INSTALL_TZDATA@
 #--------------------------------------------------------------------------
 
 GDB			= gdb
-DDD			= ddd
 TRACE			= strace
 TRACE_OPTS		=
 VALGRIND		= valgrind
@@ -738,10 +737,6 @@ shell: ${TCL_EXE}
 gdb: ${TCL_EXE}
 	$(SHELL_ENV) $(GDB) ./${TCL_EXE}
 
-# This target can be used to run tclsh inside ddd
-ddd: ${TCL_EXE}
-	$(SHELL_ENV) $(DDD) ./${TCL_EXE}
-
 valgrind: ${TCL_EXE} ${TCLTEST_EXE}
 	$(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS)
 
@@ -1877,13 +1872,13 @@ checkexports: $(TCL_LIB_FILE)
 # system.
 #
 
-rpm: all /bin/rpm
+rpm: all
 	rm -f THIS.TCL.SPEC
 	echo "%define _builddir `pwd`" > THIS.TCL.SPEC
 	echo "%define _rpmdir `pwd`/RPMS" >> THIS.TCL.SPEC
 	cat tcl.spec >> THIS.TCL.SPEC
 	mkdir -p RPMS/i386
-	rpm -bb THIS.TCL.SPEC
+	rpmbuild -bb THIS.TCL.SPEC
 	mv RPMS/i386/*.rpm .
 	rm -rf RPMS THIS.TCL.SPEC
 
@@ -2019,33 +2014,11 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
 	    tar -C $(DISTDIR)/pkgs -xzf "$$i"; \
 	done
 
-#
-# The following target can only be used for non-patch releases. Use the
-# "allpatch" target below for patch releases.
-#
-
 alldist: dist
 	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
 	cd $(DISTROOT); tar cf $(DISTNAME)-src.tar $(DISTNAME); \
 		gzip -9 $(DISTNAME)-src.tar; zip -qr8 $(ZIPNAME) $(DISTNAME)
 
-#
-# The target below is similar to "alldist" except it works for patch releases.
-# It is needed because patch releases are peculiar: the patch designation
-# appears in the name of the compressed file (e.g. tcl8.0p1.tar.gz) but the
-# extracted source directory doesn't include the patch designation (e.g.,
-# tcl8.0).
-#
-
-allpatch: dist
-	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
-	mv $(DISTROOT)/tcl${VERSION} $(DISTROOT)/old
-	mv $(DISTROOT)/$(DISTNAME) $(DISTROOT)/tcl${VERSION}
-	cd $(DISTROOT); tar cf $(DISTNAME)-src.tar tcl${VERSION}; \
-		gzip -9 $(DISTNAME)-src.tar; zip -r8 $(ZIPNAME) tcl${VERSION}
-	mv $(DISTROOT)/tcl${VERSION} $(DISTROOT)/$(DISTNAME)
-	mv $(DISTROOT)/old $(DISTROOT)/tcl${VERSION}
-
 #--------------------------------------------------------------------------
 # This target creates the HTML folder for Tcl & Tk and places it in
 # DISTDIR/html. It uses the tcltk-man2html.tcl tool from the Tcl group's tool
@@ -2078,14 +2051,16 @@ BUILD_HTML = \
 # 'make' from getting confused when someone makes an error in a rule.
 #--------------------------------------------------------------------------
 
-.PHONY: all binaries libraries doc packages tclLibObjs objs tcltest-real test
-.PHONY: test-tcl gdb-test runtest ro-test shell gdb ddd valgrind valgrindshell
-.PHONY: topDirName gendate gentommath_h install install-strip install-binaries
-.PHONY: install-libraries install-tzdata install-msgs install-doc clean dist
-.PHONY: install-private-headers distclean depend xttest configure-packages rpm
-.PHONY: packages install-packages test-packages clean-packages dist-packages
-.PHONY: distclean-packages genstubs checkstubs checkdoc checkuchar dist html
-.PHONY: checkexports alldist allpatch html-tcl html-tk install-headers
+.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
 
 #--------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- make depend depends on it.