diff options
Diffstat (limited to 'lang/tcl84/files/patch-Makefile.in')
| -rw-r--r-- | lang/tcl84/files/patch-Makefile.in | 115 |
1 files changed, 115 insertions, 0 deletions
diff --git a/lang/tcl84/files/patch-Makefile.in b/lang/tcl84/files/patch-Makefile.in new file mode 100644 index 000000000000..461f6d19736c --- /dev/null +++ b/lang/tcl84/files/patch-Makefile.in @@ -0,0 +1,115 @@ +--- Makefile.in.orig 2013-06-03 19:29:06.000000000 +0200 ++++ Makefile.in 2014-02-03 09:56:38.000000000 +0100 +@@ -56,6 +56,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@ +@@ -101,7 +103,7 @@ + #CFLAGS = $(CFLAGS_DEBUG) + #CFLAGS = $(CFLAGS_OPTIMIZE) + #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) +-CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) ++CFLAGS += @CFLAGS_DEFAULT@ @CFLAGS@ -DTCL_DBGX=$(TCL_DBGX) + + # Flags to pass to the linker + LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ +@@ -468,7 +470,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: + +@@ -479,6 +482,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 $@ +@@ -605,7 +617,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) + +@@ -631,9 +643,15 @@ + @if test ! -x $(SRC_DIR)/install-sh; then \ + chmod +x $(SRC_DIR)/install-sh; \ + fi +- @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" ++ @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" + @@INSTALL_LIB@ + @chmod 555 $(DLL_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) \ +@@ -641,8 +659,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@ ; \ +@@ -668,7 +687,8 @@ + @EXTRA_INSTALL_BINARIES@ + + install-libraries: libraries +- @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"; \ +@@ -690,11 +710,17 @@ + chmod +x $(SRC_DIR)/install-sh; \ + fi + @echo "Installing header files"; +- @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ +- $(GENERIC_DIR)/tclPlatDecls.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/tcl.h $(INCLUDE_INSTALL_DIR)/tcl.h ++ @ln -sf generic/tclDecls.h $(INCLUDE_INSTALL_DIR)/tclDecls.h ++ @ln -sf generic/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 @DTRACE_SRC@; \ |