132 lines
4.7 KiB
Plaintext
132 lines
4.7 KiB
Plaintext
--- Makefile.in.orig Fri Aug 13 18:06:14 1999
|
|
+++ Makefile.in Sat Sep 4 19:47:43 1999
|
|
@@ -56,7 +56,9 @@
|
|
BIN_DIR = $(exec_prefix)/bin
|
|
|
|
# Directory in which to install the include file tk.h:
|
|
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
|
|
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include/tk$(VERSION)
|
|
+GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
|
|
+UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
|
|
|
|
# Top-level directory for manual entries:
|
|
MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
|
|
@@ -153,7 +155,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
|
|
|
|
@@ -190,7 +192,7 @@
|
|
# Libraries to use when linking. This definition is determined by the
|
|
# configure script.
|
|
LIBS = @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
|
|
-WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
|
|
+WISH_LIBS = -L${PREFIX}/lib -ltcl82 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc
|
|
|
|
# The symbol below provides support for dynamic loading and shared
|
|
# libraries. See configure.in for a description of what it means.
|
|
@@ -356,8 +358,14 @@
|
|
${TK_LIB_FILE}: ${OBJS}
|
|
rm -f ${TK_LIB_FILE}
|
|
@MAKE_LIB@
|
|
+ ln -sf @TK_LIB_FILE@ libtk82.so
|
|
$(RANLIB) ${TK_LIB_FILE}
|
|
|
|
+libtk82.a: ${OBJS}
|
|
+ rm -f libtk82.a
|
|
+ ar cr libtk82.a ${OBJS}
|
|
+ $(RANLIB) libtk82.a
|
|
+
|
|
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
|
|
rm -f ${STUB_LIB_FILE}
|
|
@MAKE_STUB_LIB@
|
|
@@ -418,7 +426,7 @@
|
|
# some ranlibs write to current directory, and this might not always be
|
|
# possible (e.g. if installing as root).
|
|
|
|
-install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish
|
|
+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) libtk82.a wish
|
|
@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
@@ -432,12 +440,18 @@
|
|
chmod +x $(UNIX_DIR)/install-sh
|
|
chmod +x $(UNIX_DIR)/mkLinks
|
|
@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
|
|
+ @ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk82.so
|
|
@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
|
|
@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
|
|
+ @echo "Installing libtk82.a"
|
|
+ @$(INSTALL_DATA) libtk82.a $(LIB_INSTALL_DIR)/libtk82.a
|
|
+ @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk82.a)
|
|
+ @chmod 555 $(LIB_INSTALL_DIR)/libtk82.a
|
|
@echo "Installing wish"
|
|
@$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
|
|
@echo "Installing tkConfig.sh"
|
|
- @$(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)"; \
|
|
$(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
|
|
@@ -451,6 +465,7 @@
|
|
|
|
install-libraries:
|
|
@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
|
|
+ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
|
|
$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
|
|
do \
|
|
if [ ! -d $$i ] ; then \
|
|
@@ -461,11 +476,19 @@
|
|
fi; \
|
|
done;
|
|
chmod +x $(UNIX_DIR)/install-sh
|
|
- @for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h ; \
|
|
+ @echo "Installing headers"
|
|
+ @for i in $(GENERIC_DIR)/*.h ; \
|
|
do \
|
|
echo "Installing $$i"; \
|
|
- $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
|
|
+ $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
|
|
done;
|
|
+ @for i in $(UNIX_DIR)/*.h ; \
|
|
+ do \
|
|
+ echo "Installing $$i"; \
|
|
+ $(INSTALL_DATA) $$i $(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
|
|
for i in $(SRC_DIR)/library/*.tcl $(GENERIC_DIR)/prolog.ps \
|
|
$(SRC_DIR)/library/tclIndex $(UNIX_DIR)/tkAppInit.c; \
|
|
do \
|
|
@@ -530,16 +553,14 @@
|
|
$$i > $(MAN1_INSTALL_DIR)/$$i; \
|
|
chmod 444 $(MAN1_INSTALL_DIR)/$$i; \
|
|
done;
|
|
- $(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
|
|
@cd $(SRC_DIR)/doc; for i in *.3; \
|
|
do \
|
|
echo "Installing doc/$$i"; \
|
|
- rm -f $(MAN3_INSTALL_DIR)/$$i; \
|
|
+ rm -f $(MAN3_INSTALL_DIR)/$$i ; \
|
|
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
|
|
$$i > $(MAN3_INSTALL_DIR)/$$i; \
|
|
chmod 444 $(MAN3_INSTALL_DIR)/$$i; \
|
|
done;
|
|
- $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR)
|
|
@cd $(SRC_DIR)/doc; for i in *.n; \
|
|
do \
|
|
echo "Installing doc/$$i"; \
|
|
@@ -548,7 +569,6 @@
|
|
$$i > $(MANN_INSTALL_DIR)/$$i; \
|
|
chmod 444 $(MANN_INSTALL_DIR)/$$i; \
|
|
done;
|
|
- $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
|
|
|
|
Makefile: $(UNIX_DIR)/Makefile.in
|
|
$(SHELL) config.status
|