132 lines
5.1 KiB
Plaintext
132 lines
5.1 KiB
Plaintext
$OpenBSD: patch-Makefile_in,v 1.3 2004/07/03 21:04:45 jolan Exp $
|
|
--- Makefile.in.orig Mon Mar 1 17:58:59 2004
|
|
+++ Makefile.in Sat Jul 3 12:25:26 2004
|
|
@@ -40,6 +40,9 @@ mandir = @mandir@
|
|
# when installing files.
|
|
INSTALL_ROOT =
|
|
|
|
+# Path for the platform independent Tcl scripting generic header files:
|
|
+TCL_INCLUDE_GENERIC = $(prefix)/include/tcl$(VERSION)/generic
|
|
+
|
|
# Path for the platform independent Tcl scripting libraries:
|
|
TCL_LIBRARY = $(prefix)/lib/tcl$(VERSION)
|
|
|
|
@@ -320,7 +323,7 @@ GENERIC_OBJS = regcomp.o regexec.o regfr
|
|
STUB_LIB_OBJS = tclStubLib.o ${COMPAT_OBJS}
|
|
|
|
OBJS = ${GENERIC_OBJS} ${UNIX_OBJS} ${NOTIFY_OBJS} ${COMPAT_OBJS} \
|
|
- @DL_OBJS@ @PLAT_OBJS@
|
|
+ @DL_OBJS@ @PLAT_OBJS@
|
|
|
|
TCL_DECLS = \
|
|
$(GENERIC_DIR)/tcl.decls \
|
|
@@ -379,8 +382,8 @@ GENERIC_SRCS = \
|
|
$(GENERIC_DIR)/tclNamesp.c \
|
|
$(GENERIC_DIR)/tclNotify.c \
|
|
$(GENERIC_DIR)/tclObj.c \
|
|
- $(GENERIC_DIR)/tclParse.c \
|
|
- $(GENERIC_DIR)/tclParseExpr.c \
|
|
+ $(GENERIC_DIR)/tclParse.c \
|
|
+ $(GENERIC_DIR)/tclParseExpr.c \
|
|
$(GENERIC_DIR)/tclPipe.c \
|
|
$(GENERIC_DIR)/tclPkg.c \
|
|
$(GENERIC_DIR)/tclPosixStr.c \
|
|
@@ -445,7 +448,7 @@ SRCS = $(GENERIC_SRCS) $(UNIX_SRCS) $(ST
|
|
|
|
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) libtcl84.a tclsh
|
|
|
|
libraries:
|
|
|
|
@@ -461,6 +464,11 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
|
rm -f $@
|
|
@MAKE_STUB_LIB@
|
|
|
|
+libtcl84.a: ${OBJS}
|
|
+ rm -f libtcl84.a
|
|
+ ar cr libtcl84.a ${OBJS}
|
|
+ $(RANLIB) libtcl84.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
|
|
# extensions. used for the Tcl Plugin. -- dl
|
|
@@ -602,6 +610,9 @@ install-binaries: binaries
|
|
@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
|
|
@@INSTALL_LIB@
|
|
@chmod 555 $(LIB_INSTALL_DIR)/$(LIB_FILE)
|
|
+ @echo "Installing libtcl84.a"
|
|
+ @$(INSTALL_DATA) libtcl84.a $(LIB_INSTALL_DIR)/libtcl84.a
|
|
+ @chmod 555 $(LIB_INSTALL_DIR)/libtcl84.a
|
|
@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
|
|
echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
|
|
$(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
|
|
@@ -610,14 +621,16 @@ install-binaries: binaries
|
|
@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
|
|
+ @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@ ; \
|
|
fi
|
|
|
|
install-libraries: libraries
|
|
- @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
|
|
+ @for i in $(INSTALL_ROOT)$(prefix)/lib $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR) \
|
|
+ $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
echo "Making directory $$i"; \
|
|
@@ -639,11 +652,19 @@ install-libraries: libraries
|
|
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 ; \
|
|
+ @echo "Installing libraries, tcl.h and other headers"
|
|
+ @for i in $(GENERIC_DIR)/*.h ; \
|
|
do \
|
|
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
|
|
+ echo "Installing $$i"; \
|
|
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \
|
|
done;
|
|
+ @for i in $(UNIX_DIR)/*.h ; \
|
|
+ do \
|
|
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(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 \
|
|
@@ -722,6 +743,15 @@ install-doc: doc
|
|
done;
|
|
@echo "Cross-linking command (.n) docs";
|
|
@$(UNIX_DIR)/mkLinks $(MKLINKS_FLAGS) $(MANN_INSTALL_DIR)
|
|
+ @echo "**********"
|
|
+ @echo "IMPORTANT:"
|
|
+ @echo "**********"
|
|
+ @echo "tclConfig.sh in $(TCL_LIBRARY)/tclConfig.sh"
|
|
+ @echo "tcl.h in $(TCL_INCLUDE_GENERIC)/tcl.h"
|
|
+ @echo "tclDecls.h in $(TCL_INCLUDE_GENERIC)/tclDecls.h"
|
|
+ @echo "tclPlatDecls.h in $(TCL_INCLUDE_GENERIC)/tclPlatDecls.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 $(DLTEST_DIR)/Makefile.in
|
|
$(SHELL) config.status
|
|
@@ -1401,7 +1431,7 @@ package-quick: package-config package-bi
|
|
package-config:
|
|
mkdir -p $(DISTDIR)/unix/`arch`
|
|
cd $(DISTDIR)/unix/`arch`; \
|
|
- ../configure --prefix=/opt/$(PACKAGE)/$(VERSION) \
|
|
+ ../configure --prefix=/opt/$(PACKAGE)/$(VERSION) \
|
|
--exec_prefix=/opt/$(PACKAGE)/$(VERSION)/`arch` \
|
|
--enable-shared
|
|
mkdir -p $(DISTDIR)/$(PACKAGE)/$(VERSION)
|