From f1cb9a56a654ed9af7159062efa4216d1b816e14 Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 20 Oct 2009 17:23:09 +0000 Subject: Also removed the long outdated and broken targets package-* that were for building Solaris packages. Appears that the pieces needed for these targets to function have never been present in the current era of Tcl development and belong completely to Tcl pre-history. --- ChangeLog | 6 +++- unix/Makefile.in | 84 +------------------------------------------------------- 2 files changed, 6 insertions(+), 84 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c1d74d..622fe58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,11 @@ * unix/Makefile.in: Compiling Tk no longer requires header files * win/Makefile.in: from the TCL_PLATFORM DIR. Baby step in - pursuit of [Bug 1712098]. + pursuit of [Bug 1712098]. Also removed the long outdated and broken + targets package-* that were for building Solaris packages. Appears + that the pieces needed for these targets to function have never been + present in the current era of Tcl development and belong completely + to Tcl pre-history. 2009-10-20 Andreas Kupries diff --git a/unix/Makefile.in b/unix/Makefile.in index a12f75d..7e201cc 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.157 2009/10/20 16:57:25 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.158 2009/10/20 17:23:09 dgp Exp $ # Current Tk version; used in various names. @@ -1707,86 +1707,4 @@ BUILD_HTML = \ "$${TCLSH}" $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) -# -# Targets to build Solaris package of the distribution for the current -# architecture. To build stream packages for both sun4 and i86pc -# architectures: -# -# On the sun4 machine, execute the following: -# make distclean; ./configure -# make DISTDIR= package -# -# Once the build is complete, execute the following on the i86pc -# machine: -# make DISTDIR= package-quick -# -# is the absolute path to a directory where the build should -# take place. These steps will generate the $(PACKAGE).sun4 and -# $(PACKAGE).i86pc stream packages. It is important that the packages be -# built in this fashion in order to ensure that the architecture -# independent files are exactly the same, including timestamps, in -# both packages. -# - -PACKAGE=SCRPtk - -package: dist package-config package-common package-binaries package-generate -package-quick: package-config package-binaries package-generate - -# -# Configure for the current architecture in the dist directory. -# -package-config: - mkdir -p $(DISTDIR)/unix/`arch` - cd $(DISTDIR)/unix/`arch`; \ - ../configure --prefix=/opt/SUNWtcl/$(TCLVERSION) \ - --exec_prefix=/opt/SUNWtcl/$(TCLVERSION)/`arch` \ - --with-tcl=$(DISTDIR)/../tcl$(TCLVERSION)/unix/`arch` \ - --enable-shared - mkdir -p $(DISTDIR)/SUNWtcl/$(TCLVERSION) - mkdir -p $(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch` - -# -# Build and install the architecture independent files in the dist directory. -# - -package-common: - cd $(DISTDIR)/unix/`arch`;\ - $(MAKE); \ - $(MAKE) install-libraries install-doc \ - prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION) \ - exec_prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch` - mkdir -p $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin - sed -e "s/TCLVERSION/$(TCLVERSION)/g" \ - -e "s/TKVERSION/$(VERSION)/g" < $(UNIX_DIR)/wish.sh \ - > $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION) - chmod 755 $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin/wish$(VERSION) - -# -# Build and install the architecture specific files in the dist directory. -# - -package-binaries: - cd $(DISTDIR)/unix/`arch`; \ - $(MAKE); \ - $(MAKE) install-binaries prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION) \ - exec_prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch` - -# -# Generate a package from the installed files in the dist directory for the -# current architecture. -# - -package-generate: - pkgproto $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin=bin \ - $(DISTDIR)/SUNWtcl/$(TCLVERSION)/include=include \ - $(DISTDIR)/SUNWtcl/$(TCLVERSION)/lib=lib \ - $(DISTDIR)/SUNWtcl/$(TCLVERSION)/man=man \ - $(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch`=`arch` \ - | $(TCL_EXE) $(TCLDIR)/unix/mkProto.tcl $(TCLVERSION) \ - $(UNIX_DIR) > prototype - pkgmk -o -d . -f prototype -a `arch` - pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE) - rm -rf $(PACKAGE) - # DO NOT DELETE THIS LINE -- make depend depends on it. -- cgit v0.12