diff options
Diffstat (limited to 'lang/tcl86/files/patch-unix-Makefile.in')
| -rw-r--r-- | lang/tcl86/files/patch-unix-Makefile.in | 145 |
1 files changed, 0 insertions, 145 deletions
diff --git a/lang/tcl86/files/patch-unix-Makefile.in b/lang/tcl86/files/patch-unix-Makefile.in deleted file mode 100644 index c5840deb2c98..000000000000 --- a/lang/tcl86/files/patch-unix-Makefile.in +++ /dev/null @@ -1,145 +0,0 @@ ---- Makefile.in.orig Thu Apr 26 19:33:51 2007 -+++ Makefile.in Sun Apr 29 22:33:58 2007 -@@ -54,6 +54,8 @@ - - # Directory in which to install the include file tcl.h: - INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) -+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic -+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix - - # Path to the private tcl header dir: - PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -97,7 +99,7 @@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -+CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ - - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -540,7 +542,8 @@ - - all: binaries libraries doc - --binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) tclsh -+binaries: ${LIB_FILE} $(STUB_LIB_FILE) $(TCL_BUILD_EXP_FILE) \ -+ libtcl${SHORT_TCL_VER}.a tclsh - - libraries: - -@@ -551,6 +554,15 @@ - ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} - rm -f $@ - @MAKE_LIB@ -+ @ln -sf $(LIB_FILE) ./libtcl${SHORT_TCL_VER}.so -+ if test "x@DL_OBJS@" = "xtclLoadAout.o"; then \ -+ $(RANLIB) ${LIB_FILE}; \ -+ fi -+ -+libtcl${SHORT_TCL_VER}.a: ${OBJS} -+ rm -f libtcl${SHORT_TCL_VER}.a -+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS} -+ $(RANLIB) libtcl${SHORT_TCL_VER}.a - - ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} - rm -f $@ -@@ -699,7 +711,7 @@ - dltest.marker: ${STUB_LIB_FILE} - cd dltest ; $(MAKE) - --INSTALL_TARGETS = install-binaries install-libraries install-doc @EXTRA_INSTALL@ -+INSTALL_TARGETS = install-binaries install-libraries @EXTRA_INSTALL@ - - install: $(INSTALL_TARGETS) - -@@ -728,6 +740,13 @@ - @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" - @@INSTALL_LIB@ - @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE) -+ @ln -sf $(LIB_FILE) $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.so -+ @echo "Installing libtcl${SHORT_TCL_VER}.a" -+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a \ -+ $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a -+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtcl${SHORT_TCL_VER}.a) -+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl${SHORT_TCL_VER}.a -+ - @if test "$(TCL_BUILD_EXP_FILE)" != ""; then \ - echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \ - $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \ -@@ -735,8 +754,9 @@ - fi - @echo "Installing tclsh as $(BIN_INSTALL_DIR)/tclsh$(VERSION)" - @$(INSTALL_PROGRAM) tclsh $(BIN_INSTALL_DIR)/tclsh$(VERSION) -- @echo "Installing tclConfig.sh to $(LIB_INSTALL_DIR)/" -- @$(INSTALL_DATA) tclConfig.sh $(LIB_INSTALL_DIR)/tclConfig.sh -+ @echo "Installing tclConfig.sh to $(SCRIPT_INSTALL_DIR)/" -+ @mkdir -p $(SCRIPT_INSTALL_DIR) -+ @$(INSTALL_DATA) tclConfig.sh $(SCRIPT_INSTALL_DIR)/tclConfig.sh - @if test "$(STUB_LIB_FILE)" != "" ; then \ - echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ - @INSTALL_STUB_LIB@ ; \ -@@ -744,7 +764,8 @@ - @EXTRA_INSTALL_BINARIES@ - - install-libraries: libraries $(INSTALL_TZDATA) install-msgs -- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \ -+ @for i in $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ -+ $(SCRIPT_INSTALL_DIR); \ - do \ - if [ ! -d $$i ] ; then \ - echo "Making directory $$i"; \ -@@ -766,13 +787,17 @@ - chmod +x $(SRC_DIR)/../unix/install-sh; \ - fi - @echo "Installing header files"; -- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ -- $(GENERIC_DIR)/tclPlatDecls.h \ -- $(GENERIC_DIR)/tclTomMath.h \ -- $(GENERIC_DIR)/tclTomMathDecls.h ; \ -+ @for i in $(GENERIC_DIR)/*.h ; \ -+ do \ -+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \ -+ done; -+ @for i in $(UNIX_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \ -+ $(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 -+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tclPlatDecls.h $(INCLUDE_INSTALL_DIR)/tclPlatDecls.h - @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; - @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \ - do \ -@@ -839,18 +864,27 @@ - done; - @echo "Installing and cross-linking top-level (.1) docs"; - @for i in $(TOP_DIR)/doc/*.1; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN1_INSTALL_DIR); \ -+ ${BSD_INSTALL_MAN} $$i $(MAN1_INSTALL_DIR); \ - done - - @echo "Installing and cross-linking C API (.3) docs"; - @for i in $(TOP_DIR)/doc/*.3; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \ -+ ${BSD_INSTALL_MAN} $$i $(MAN3_INSTALL_DIR); \ - done - - @echo "Installing and cross-linking command (.n) docs"; - @for i in $(TOP_DIR)/doc/*.n; do \ -- $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \ -+ ${BSD_INSTALL_MAN} $$i $(MANN_INSTALL_DIR); \ - done -+ -+ @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." - - # Optional target to install private headers - install-private-headers: libraries |