diff options
Diffstat (limited to 'x11-toolkits/tk80/files/patch-ab')
| -rw-r--r-- | x11-toolkits/tk80/files/patch-ab | 88 |
1 files changed, 11 insertions, 77 deletions
diff --git a/x11-toolkits/tk80/files/patch-ab b/x11-toolkits/tk80/files/patch-ab index b0d582127c67..2edc6fc428db 100644 --- a/x11-toolkits/tk80/files/patch-ab +++ b/x11-toolkits/tk80/files/patch-ab @@ -1,37 +1,23 @@ ---- Makefile.in.orig Wed Nov 18 14:54:53 1998 -+++ Makefile.in Tue Dec 1 13:10:35 1998 -@@ -56,7 +56,9 @@ - BIN_DIR = $(exec_prefix)/bin - +--- Makefile.in.orig Mon Mar 8 22:53:50 1999 ++++ Makefile.in Mon Aug 23 12:50:30 2004 +@@ -58,3 +58,5 @@ # 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 -@@ -112,7 +114,7 @@ - - # Libraries to use when linking. This definition is determined by the +@@ -114,3 +116,3 @@ # configure script. -LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc +LIBS = -L${PREFIX}/lib -ltcl80 @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ -lc - # To turn off the security checks that disallow incoming sends when - # the X server appears to be insecure, reverse the comments on the -@@ -148,7 +150,7 @@ - # "install" around; better to use the install-sh script that comes - # with the distribution, which is slower but guaranteed to work. +@@ -150,3 +152,3 @@ -INSTALL = @srcdir@/install-sh -c +INSTALL = install -c INSTALL_PROGRAM = ${INSTALL} - INSTALL_DATA = ${INSTALL} -m 644 - -@@ -311,6 +313,11 @@ - @MAKE_LIB@ - $(RANLIB) ${TK_LIB_FILE} +@@ -313,2 +315,7 @@ +libtk80.a: ${OBJS} + rm -f libtk80.a @@ -39,41 +25,29 @@ + ranlib libtk80.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 - # extensions. used for the Tcl Plugin. -- dl -@@ -365,7 +372,7 @@ - # some ranlibs write to current directory, and this might not always be - # possible (e.g. if installing as root). +@@ -367,3 +374,3 @@ -install-binaries: $(TK_LIB_FILE) wish +install-binaries: $(TK_LIB_FILE) libtk80.a wish @for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \ - do \ - if [ ! -d $$i ] ; then \ -@@ -379,13 +386,19 @@ - @$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) - @(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE)) +@@ -381,2 +388,6 @@ @chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) + @echo "Installing libtk80.a" + @$(INSTALL_DATA) libtk80.a $(LIB_INSTALL_DIR)/libtk80.a + @(cd $(LIB_INSTALL_DIR); $(RANLIB) libtk80.a) + @chmod 555 $(LIB_INSTALL_DIR)/libtk80.a @echo "Installing wish" - @$(INSTALL_PROGRAM) wish $(BIN_INSTALL_DIR)/wish$(VERSION) +@@ -384,3 +395,4 @@ @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 - install-libraries: +@@ -388,2 +400,3 @@ @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 \ -@@ -395,8 +408,18 @@ - else true; \ - fi; \ +@@ -397,4 +410,14 @@ done; - @echo "Installing tk.h" - @$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk.h @@ -90,43 +64,3 @@ + 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"; \ -@@ -455,28 +478,28 @@ - @cd $(SRC_DIR)/doc; for i in *.1; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MAN1_INSTALL_DIR)/$$i; \ -+ rm -f $(MAN1_INSTALL_DIR)/$$i $(MAN1_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN1_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN1_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN1_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN1_INSTALL_DIR)/$$i.gz; \ - 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 $(MAN3_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MAN3_INSTALL_DIR)/$$i; \ -- chmod 444 $(MAN3_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MAN3_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MAN3_INSTALL_DIR)/$$i.gz; \ - done; - $(UNIX_DIR)/mkLinks $(MAN3_INSTALL_DIR) - @cd $(SRC_DIR)/doc; for i in *.n; \ - do \ - echo "Installing doc/$$i"; \ -- rm -f $(MANN_INSTALL_DIR)/$$i; \ -+ rm -f $(MANN_INSTALL_DIR)/$$i $(MANN_INSTALL_DIR)/$$i.gz; \ - sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \ -- $$i > $(MANN_INSTALL_DIR)/$$i; \ -- chmod 444 $(MANN_INSTALL_DIR)/$$i; \ -+ $$i | gzip -c > $(MANN_INSTALL_DIR)/$$i.gz; \ -+ chmod 444 $(MANN_INSTALL_DIR)/$$i.gz; \ - done; - $(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR) - |