diff options
author | cvs2svn <cvs2svn@FreeBSD.org> | 1999-12-17 08:18:04 +0000 |
---|---|---|
committer | cvs2svn <cvs2svn@FreeBSD.org> | 1999-12-17 08:18:04 +0000 |
commit | c9725fb85b442f5229246e7b4e1c53e913dbbb90 (patch) | |
tree | e00c7b9a13c8748065f79c57e9e81d9a1239e743 /lang/tcl84/files/patch-aa | |
parent | ee7f9aa44a92849ab34d5b387a3d79f974023b65 (diff) |
This commit was manufactured by cvs2svn to create tag 'RELEASE_3_4_0'.release/3.4.0
Notes
Notes:
svn path=/head/; revision=23787
svn path=/tags/RELEASE_3_4_0/; revision=23788; tag=release/3.4.0
Diffstat (limited to 'lang/tcl84/files/patch-aa')
-rw-r--r-- | lang/tcl84/files/patch-aa | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/lang/tcl84/files/patch-aa b/lang/tcl84/files/patch-aa deleted file mode 100644 index 347b053cfc41..000000000000 --- a/lang/tcl84/files/patch-aa +++ /dev/null @@ -1,153 +0,0 @@ ---- Makefile.in.orig Wed Nov 3 21:37:24 1999 -+++ Makefile.in Sun Nov 21 15:31:00 1999 -@@ -48,7 +48,9 @@ - SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) - - # Directory in which to install the include file tcl.h: --INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include -+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tcl$(VERSION) -+GENERIC_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PREFIX)/include/tcl$(VERSION)/unix - - # Top-level directory in which to install manual entries: - MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man -@@ -82,7 +84,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS@ -+CFLAGS? = @CFLAGS@ - - # To disable ANSI-C procedure prototypes reverse the comment characters - # on the following lines: -@@ -156,7 +158,7 @@ - # "install" around; better to use the install-sh script that comes - # with the distribution, which is slower but guaranteed to work. - --INSTALL = @srcdir@/install-sh -c -+INSTALL = install -c - INSTALL_PROGRAM = ${INSTALL} - INSTALL_DATA = ${INSTALL} -m 644 - -@@ -383,7 +385,7 @@ - - all: binaries libraries doc - --binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh -+binaries: ${TCL_LIB_FILE} $(TCL_STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) libtcl82.a tclsh - - libraries: - -@@ -394,8 +396,14 @@ - ${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} - rm -f ${TCL_LIB_FILE} - @MAKE_LIB@ -+ ln -sf ${TCL_LIB_FILE} libtcl82.so - $(RANLIB) ${TCL_LIB_FILE} - -+libtcl82.a: ${OBJS} -+ rm -f libtcl82.a -+ ar cr libtcl82.a ${OBJS} -+ $(RANLIB) libtcl82.a -+ - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f ${STUB_LIB_FILE} - @MAKE_STUB_LIB@ -@@ -504,8 +512,13 @@ - @echo "Installing $(TCL_LIB_FILE)" - chmod +x $(SRC_DIR)/install-sh - @$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @ln -sf $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/libtcl82.so - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE)) - @chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE) -+ @echo "Installing libtcl82.a" -+ @$(INSTALL_DATA) libtcl82.a $(LIB_INSTALL_DIR)/libtcl82.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl82.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl82.a - @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TCL_EXP_FILE)"; \ - $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -514,7 +527,8 @@ - @echo "Installing tclsh" - @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) - @echo "Installing tclConfig.sh" -- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh -+ @mkdir -p $(SCRIPT_INSTALL_DIR) -+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh - @if test "$(TCL_STUB_LIB_FILE)" != "" ; then \ - echo "Installing $(TCL_STUB_LIB_FILE)"; \ - $(INSTALL_DATA) $(STUB_LIB_FILE) \ -@@ -522,8 +536,8 @@ - fi - - install-libraries: libraries -- @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ -- $(SCRIPT_INSTALL_DIR); \ -+ @for i in $(INSTALL_ROOT)$(prefix)/lib $(GENERIC_INCLUDE_INSTALL_DIR) \ -+ $(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -@@ -542,11 +556,20 @@ - fi; \ - done; - chmod +x $(SRC_DIR)/install-sh -- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h ; \ -+ @echo "Installing libraries, tcl.h and other headers" -+ @for i in $(GENERIC_DIR)/*.h ; \ - do \ - echo "Installing $$i"; \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ - done; -+ @for i in $(UNIX_DIR)/*.h ; \ -+ do \ -+ echo "Installing $$i"; \ -+ $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \ -+ done; -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h -+ - @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ - do \ - echo "Installing $$i"; \ -@@ -579,21 +602,19 @@ - @cd $(TOP_DIR)/doc; for i in *.1; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN1_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN1_INSTALL_DIR)/$$i ; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MAN1_INSTALL_DIR)/$$i; \ - chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ - done; -- $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR) - @cd $(TOP_DIR)/doc; for i in *.3; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN3_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN3_INSTALL_DIR)/$$i ; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ - $$i > $(MAN3_INSTALL_DIR)/$$i; \ - chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ - done; -- $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) - @cd $(TOP_DIR)/doc; for i in *.n; \ - do \ - echo "Installing doc/$$i"; \ -@@ -602,7 +623,14 @@ - $$i > $(MANN_INSTALL_DIR)/$$i; \ - chmod 444 $(MANN_INSTALL_DIR)/$$i; \ - done; -- $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) -+ @echo "**********" -+ @echo "IMPORTANT:" -+ @echo "**********" -+ @echo "tclConfig.sh in $(SCRIPT_INSTALL_DIR)/tclConfig.sh" -+ @echo "tcl.h in $(INCLUDE_INSTALL_DIR)/tcl.h" -+ @echo "tclDecls.h in $(INCLUDE_INSTALL_DIR)/tclDecls.h" -+ @echo "There are NOT default place, but good place to avoid" -+ @echo "conflicting with another version of Tcl/Tks." - - Makefile: $(UNIX_DIR)/Makefile.in - $(SHELL) config.status |