129 lines
4.5 KiB
Plaintext
129 lines
4.5 KiB
Plaintext
--- Makefile.in.orig Tue Dec 14 22:59:18 1999
|
|
+++ Makefile.in Sat Jan 29 18:47:39 2000
|
|
@@ -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 = $(INCLUDE_INSTALL_DIR)/generic
|
|
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/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,12 +396,15 @@
|
|
${TCL_LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
|
|
rm -f ${TCL_LIB_FILE}
|
|
@MAKE_LIB@
|
|
- $(RANLIB) ${TCL_LIB_FILE}
|
|
|
|
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
|
rm -f ${STUB_LIB_FILE}
|
|
@MAKE_STUB_LIB@
|
|
- $(RANLIB) ${STUB_LIB_FILE}
|
|
+
|
|
+libtcl82.a: ${OBJS}
|
|
+ rm -f libtcl82.a
|
|
+ ar cr libtcl82.a ${OBJS}
|
|
+ $(RANLIB) libtcl82.a
|
|
|
|
# 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
|
|
@@ -504,8 +509,10 @@
|
|
@echo "Installing $(TCL_LIB_FILE)"
|
|
chmod +x $(SRC_DIR)/install-sh
|
|
@$(INSTALL_DATA) $(TCL_LIB_FILE) $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
|
|
- @(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
|
|
+ @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 +521,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 +530,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 +550,19 @@
|
|
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 $(GENERIC_INCLUDE_INSTALL_DIR); \
|
|
+ done;
|
|
+ @for i in $(UNIX_DIR)/*.h ; \
|
|
do \
|
|
echo "Installing $$i"; \
|
|
- $(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
|
|
@for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix; \
|
|
do \
|
|
echo "Installing $$i"; \
|
|
@@ -603,6 +619,14 @@
|
|
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 "These are NOT in the default place, but in a good place to avoid"
|
|
+ @echo "conflicting with another version of Tcl/Tk."
|
|
|
|
Makefile: $(UNIX_DIR)/Makefile.in
|
|
$(SHELL) config.status
|