3189053689
In this case using PREFIX in a Makefile to find installed files is obviously wrong. In 8.3 and 8.4 this part of the patch is not necessary at all, so just remove it. In 8.0 use TCL_LIB_SPEC, as is used in 8.3 and 8.4. problem noted by Rod.. Whitworth <listen at witworx.com>
80 lines
3.0 KiB
Plaintext
80 lines
3.0 KiB
Plaintext
$OpenBSD: patch-Makefile_in,v 1.3 2004/12/05 11:39:06 sturm Exp $
|
|
--- Makefile.in.orig Wed Oct 23 17:45:50 2002
|
|
+++ Makefile.in Mon Dec 2 15:41:08 2002
|
|
@@ -356,7 +356,7 @@
|
|
|
|
all: binaries libraries doc
|
|
|
|
-binaries: ${TK_LIB_FILE} ${STUB_LIB_FILE} wish
|
|
+binaries: ${TK_LIB_FILE} ${STUB_LIB_FILE} libtk83.a wish
|
|
|
|
libraries:
|
|
|
|
@@ -371,12 +371,15 @@
|
|
${TK_LIB_FILE}: ${OBJS}
|
|
rm -f ${TK_LIB_FILE}
|
|
@MAKE_LIB@
|
|
- $(RANLIB) ${TK_LIB_FILE}
|
|
|
|
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
|
rm -f ${STUB_LIB_FILE}
|
|
@MAKE_STUB_LIB@
|
|
- $(RANLIB) ${STUB_LIB_FILE}
|
|
+
|
|
+libtk83.a: ${OBJS}
|
|
+ rm -f libtk83.a
|
|
+ ar cr libtk83.a ${OBJS}
|
|
+ $(RANLIB) libtk83.a
|
|
|
|
# Make target which outputs the list of the .o contained in the Tk lib
|
|
# usefull to build a single big shared library containing Tcl/Tk and other
|
|
@@ -478,12 +481,15 @@
|
|
fi
|
|
@echo "Installing $(TK_LIB_FILE) to $(LIB_INSTALL_DIR)/"
|
|
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
|
|
- @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
|
|
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
|
|
+ @echo "Installing libtk83.a"
|
|
+ @$(INSTALL_DATA) libtk83.a $(LIB_INSTALL_DIR)/libtk83.a
|
|
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk83.a
|
|
@echo "Installing wish as $(BIN_INSTALL_DIR)/wish$(VERSION)"
|
|
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
|
|
@echo "Installing tkConfig.sh to $(LIB_INSTALL_DIR)/"
|
|
- @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
|
|
+ @mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
|
|
+ @$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
|
|
@if test "$(TK_BUILD_EXP_FILE)" != ""; then \
|
|
echo "Installing $(TK_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
|
|
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
|
|
@@ -497,6 +503,7 @@
|
|
|
|
install-libraries:
|
|
@for i in $(INCLUDE_INSTALL_DIR) \
|
|
+ $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR) $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR) \
|
|
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
@@ -510,11 +517,19 @@
|
|
chmod +x $(UNIX_DIR)/install-sh; \
|
|
fi
|
|
@echo "Installing header files";
|
|
- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \
|
|
- $(GENERIC_DIR)/tkDecls.h ; \
|
|
+ @for i in $(GENERIC_DIR)/*.h ; \
|
|
+ do \
|
|
+ echo "Installing $$i"; \
|
|
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(GENERIC_INCLUDE_INSTALL_DIR); \
|
|
+ done
|
|
+ @for i in $(UNIX_DIR)/*.h ; \
|
|
do \
|
|
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
|
|
+ $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(UNIX_INCLUDE_INSTALL_DIR); \
|
|
done;
|
|
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h
|
|
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkDecls.h $(INCLUDE_INSTALL_DIR)/tkDecls.h
|
|
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkPlatDecls.h $(INCLUDE_INSTALL_DIR)/tkPlatDecls.h
|
|
+ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tkIntXlibDecls.h $(INCLUDE_INSTALL_DIR)/tkIntXlibDecls.h
|
|
@echo "Installing library files to $(SCRIPT_INSTALL_DIR)";
|
|
@for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
|
|
$(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
|