2e98337877
into one dir, simplify modules dirs layout, improved building wrt threads/compiler flags, etc. ok landry@, sebastiap@
137 lines
4.7 KiB
Plaintext
137 lines
4.7 KiB
Plaintext
$OpenBSD: patch-unix_Makefile_in,v 1.2 2011/01/05 16:19:48 stu Exp $
|
|
--- unix/Makefile.in.orig Thu Apr 17 16:29:49 2008
|
|
+++ unix/Makefile.in Sun Oct 3 08:48:18 2010
|
|
@@ -485,6 +485,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
|
rm -f $@
|
|
@MAKE_STUB_LIB@
|
|
|
|
+libtcl84.a: ${OBJS}
|
|
+ rm -f $@
|
|
+ ${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@
|
|
+
|
|
# Make target which outputs the list of the .o contained in the Tcl lib
|
|
# usefull to build a single big shared library containing Tcl and other
|
|
# extensions. used for the Tcl Plugin. -- dl
|
|
@@ -620,21 +624,16 @@ install-strip:
|
|
# possible (e.g. if installing as root).
|
|
|
|
install-binaries: binaries
|
|
- @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
|
|
+ @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(SCRIPT_INSTALL_DIR) ; \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
echo "Making directory $$i"; \
|
|
- mkdir -p $$i; \
|
|
- chmod 755 $$i; \
|
|
+ ${INSTALL_DATA_DIR} $$i; \
|
|
else true; \
|
|
fi; \
|
|
done;
|
|
- @if test ! -x $(SRC_DIR)/install-sh; then \
|
|
- chmod +x $(SRC_DIR)/install-sh; \
|
|
- fi
|
|
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
|
|
@@INSTALL_LIB@
|
|
- @chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
|
|
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
|
|
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
|
|
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
|
|
@@ -642,8 +641,8 @@ install-binaries: binaries
|
|
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)/"
|
|
+ @$(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@ ; \
|
|
@@ -655,8 +654,7 @@ install-libraries: libraries
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
echo "Making directory $$i"; \
|
|
- mkdir -p $$i; \
|
|
- chmod 755 $$i; \
|
|
+ ${INSTALL_DATA_DIR} $$i; \
|
|
else true; \
|
|
fi; \
|
|
done;
|
|
@@ -664,14 +662,10 @@ install-libraries: libraries
|
|
do \
|
|
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
|
|
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
|
|
- mkdir -p $(SCRIPT_INSTALL_DIR)/$$i; \
|
|
- chmod 755 $(SCRIPT_INSTALL_DIR)/$$i; \
|
|
+ ${INSTALL_DATA_DIR} $(SCRIPT_INSTALL_DIR)/$$i; \
|
|
else true; \
|
|
fi; \
|
|
done;
|
|
- @if test ! -x $(SRC_DIR)/install-sh; then \
|
|
- 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; \
|
|
@@ -680,7 +674,7 @@ install-libraries: libraries
|
|
done;
|
|
@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@; \
|
|
+ $(UNIX_DIR)/tclAppInit.c @DTRACE_SRC@; \
|
|
do \
|
|
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
|
|
done;
|
|
@@ -715,31 +709,27 @@ install-libraries: libraries
|
|
done;
|
|
|
|
install-doc: doc
|
|
- @if test ! -x $(UNIX_DIR)/installManPage; then \
|
|
- chmod +x $(UNIX_DIR)/installManPage; \
|
|
- fi
|
|
@for i in $(MAN_INSTALL_DIR) $(MAN1_INSTALL_DIR) $(MAN3_INSTALL_DIR) $(MANN_INSTALL_DIR) ; \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
echo "Making directory $$i"; \
|
|
- mkdir -p $$i; \
|
|
- chmod 755 $$i; \
|
|
+ ${INSTALL_DATA_DIR} $$i; \
|
|
else true; \
|
|
fi; \
|
|
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); \
|
|
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$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); \
|
|
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$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); \
|
|
+ $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
|
|
done
|
|
|
|
# Optional target to install private headers
|
|
@@ -748,14 +738,10 @@ install-private-headers: libraries
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
echo "Making directory $$i"; \
|
|
- mkdir -p $$i; \
|
|
- chmod 755 $$i; \
|
|
+ ${INSTALL_DATA_DIR} $$i; \
|
|
else true; \
|
|
fi; \
|
|
done;
|
|
- @if test ! -x $(SRC_DIR)/install-sh; then \
|
|
- chmod +x $(SRC_DIR)/install-sh; \
|
|
- fi
|
|
@echo "Installing private header files";
|
|
@for i in $(GENERIC_DIR)/tclInt.h $(GENERIC_DIR)/tclIntDecls.h \
|
|
$(GENERIC_DIR)/tclIntPlatDecls.h \
|