diff options
Diffstat (limited to 'x11-toolkits/tk82/files/patch-ab')
| -rw-r--r-- | x11-toolkits/tk82/files/patch-ab | 45 |
1 files changed, 36 insertions, 9 deletions
diff --git a/x11-toolkits/tk82/files/patch-ab b/x11-toolkits/tk82/files/patch-ab index 9bccfff1ea16..feae30fefebc 100644 --- a/x11-toolkits/tk82/files/patch-ab +++ b/x11-toolkits/tk82/files/patch-ab @@ -1,15 +1,17 @@ ---- Makefile.in.orig Fri Aug 15 16:17:51 1997 -+++ Makefile.in Sun Aug 31 21:36:30 1997 -@@ -56,7 +56,7 @@ +--- Makefile.in.orig Fri Aug 15 22:17:51 1997 ++++ Makefile.in Wed Oct 1 10:07:16 1997 +@@ -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 -@@ -94,11 +94,11 @@ +@@ -94,11 +96,11 @@ # Libraries to use when linking. This definition is determined by the # configure script. @@ -23,7 +25,7 @@ # To turn off the security checks that disallow incoming sends when # the X server appears to be insecure, reverse the comments on the -@@ -134,7 +134,7 @@ +@@ -134,7 +136,7 @@ # "install" around; better to use the install-sh script that comes # with the distribution, which is slower but guaranteed to work. @@ -32,7 +34,7 @@ INSTALL_PROGRAM = ${INSTALL} INSTALL_DATA = ${INSTALL} -m 644 -@@ -290,6 +290,11 @@ +@@ -290,6 +292,11 @@ @MAKE_LIB@ $(RANLIB) @TK_LIB_FILE@ @@ -44,7 +46,7 @@ # 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 # extensions. used for the Tcl Plugin. -- dl -@@ -340,7 +345,7 @@ +@@ -340,7 +347,7 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). @@ -53,7 +55,7 @@ @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ do \ if [ ! -d $$i ] ; then \ -@@ -354,10 +359,15 @@ +@@ -354,13 +361,19 @@ @$(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) @@ -70,7 +72,32 @@ install-libraries: @for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \ -@@ -430,28 +440,28 @@ ++ $(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \ + $(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \ + do \ + if [ ! -d $$i ] ; then \ +@@ -370,8 +383,18 @@ + else true; \ + fi; \ + done; +- @echo "Installing tk.h" +- @$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h ++ @echo "Installing 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 $(UNIX_INCLUDE_INSTALL_DIR); \ ++ done; ++ @ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h + for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \ + do \ + echo "Installing $$i"; \ +@@ -430,28 +453,28 @@ @cd $(SRC_DIR)/doc; for i in *.1; \ do \ echo "Installing doc/$$i"; \ |