A stab at fixing Tk/unix/Makefile.in

From: David Fox <fox_at_graphics.cs.nyu.edu>
Date: 14 Aug 1996 08:23:01 -0400

Here's a patch which I believe makes Tk/unix/Makefile.in do what it is
supposed to do. I assume it should install the library as libtk4.1.a,
right?

diff -ru STk-3.1/Tk/unix/Makefile.in~ STk-3.1/Tk/unix/Makefile.in
--- STk-3.1/Tk/unix/Makefile.in~ Wed Jul 24 12:47:12 1996
+++ STk-3.1/Tk/unix/Makefile.in Wed Aug 14 06:27:40 1996
_at_@ -46,16 +46,16 @@
 SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TK_LIBRARY)
 
 # Directory in which to install the archive libtk.a:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(execdir)
 
 # Directory in which to install the program wish:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(execdir)
 
 # Directory from which the program wish should be referenced by scripts:
 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)$(incdir)
 
 # Top-level directory for manual entries:
 MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
_at_@ -299,7 +299,7 @@
 
 install: all
 
-install-binaries: libtk.a wish
+install-binaries: wish
         _at_for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
             do \
             if [ ! -d $$i ] ; then \
_at_@ -309,15 +309,16 @@
                 else true; \
                 fi; \
             done;
- _at_echo "Installing libtk.a"
- _at_$(INSTALL_DATA) libtk.a $(LIB_INSTALL_DIR)/libtk$(VERSION).a
- _at_$(RANLIB) $(LIB_INSTALL_DIR)/libtk$(VERSION).a
         _at_echo "Installing wish"
         _at_$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION)
+ for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
+ do \
+ echo "Installing $$i"; \
+ $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
+ done;
 
-install-libraries:
- _at_for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
- $(SCRIPT_INSTALL_DIR) ; \
+install-libraries: libtk.a
+ _at_for i in $(LIB_INSTALL_DIR) $(INCLUDE_INSTALL_DIR) ; \
             do \
             if [ ! -d $$i ] ; then \
                 echo "Making directory $$i"; \
_at_@ -328,11 +329,9 @@
             done;
         _at_echo "Installing tk.h"
         _at_$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)
- for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
- do \
- echo "Installing $$i"; \
- $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
- done;
+ _at_echo "Installing libtk.a"
+ _at_$(INSTALL_DATA) libtk.a $(LIB_INSTALL_DIR)/libtk$(VERSION).a
+ _at_$(RANLIB) $(LIB_INSTALL_DIR)/libtk$(VERSION).a
 
 install-demos:
         _at_for i in $(INSTALL_ROOT)$(prefix)/lib $(SCRIPT_INSTALL_DIR) \
-- 
David Fox           http://found.cs.nyu.edu/fox            xoF divaD
NYU Media Research Lab     fox_at_cs.nyu.edu     baL hcraeseR aideM UYN
Received on Wed Aug 14 1996 - 13:57:42 CEST

This archive was generated by hypermail 2.3.0 : Mon Jul 21 2014 - 19:38:59 CEST