aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/tix/files/patch-ac
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/tix/files/patch-ac')
-rw-r--r--x11-toolkits/tix/files/patch-ac52
1 files changed, 49 insertions, 3 deletions
diff --git a/x11-toolkits/tix/files/patch-ac b/x11-toolkits/tix/files/patch-ac
index 937a18e40784..6c16cdc3cf8f 100644
--- a/x11-toolkits/tix/files/patch-ac
+++ b/x11-toolkits/tix/files/patch-ac
@@ -1,5 +1,5 @@
--- Makefile.in.orig Sun Feb 16 06:12:37 1997
-+++ Makefile.in Fri Feb 21 11:18:44 1997
++++ Makefile.in Sun Apr 20 01:37:54 1997
@@ -29,7 +29,7 @@
# Directory in which to install the library of Tix scripts and demos
# (note: you can set the TIX_LIBRARY environment variable at run-time to
@@ -9,7 +9,7 @@
# Directory in which to install the archive libtix.a:
LIB_DIR = $(exec_prefix)/lib
-@@ -70,12 +70,12 @@
+@@ -70,16 +70,16 @@
TK_GENERIC_DIR = $(TK_SRC_DIR)/generic
# Libraries to use when linking:
@@ -23,8 +23,14 @@
-LIBS_TCLONLY = @TCL_BUILD_LIB_SPEC@ @TCL_LIBS@
+LIBS_TCLONLY = @TCL_LIB_SPEC@ @TCL_LIBS@
- RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/library \
+-RUN_TCLSH = TCL_LIBRARY=$(TCL_SRC_DIR)/library \
++RUN_TCLSH = TCL_LIBRARY=/usr/libdata/tcl \
TK_LIBRARY=$(TK_SRC_DIR)/library \
+- $(TCL_SRC_DIR)/unix/tclsh
++ /usr/bin/tclsh
+
+
+ #----------------------------------------------------------------
@@ -131,7 +131,8 @@
CC_SWITCHES = $(CFLAGS) $(AC_FLAGS) -I$(TCL_GENERIC_DIR) \
-I$(TCL_SRC_DIR)/unix -I$(TK_GENERIC_DIR) -I$(TK_SRC_DIR)/unix \
@@ -35,3 +41,43 @@
#----------------------------------------------------------------
# The information below should be usable as is. You shouldn't need
+@@ -210,24 +211,24 @@
+ # scripts of TK must be included in the fixed order.
+ #----------------------------------------------------------------------
+
+-TCL_SCRIPTS = $(TCL_SRC_DIR)/library/*.tcl
++TCL_SCRIPTS = /usr/libdata/tcl/*.tcl
+
+ TK_SCRIPTS = \
+- $(TK_SRC_DIR)/library/bgerror.tcl \
+- $(TK_SRC_DIR)/library/dialog.tcl \
+- $(TK_SRC_DIR)/library/focus.tcl \
+- $(TK_SRC_DIR)/library/obsolete.tcl \
+- $(TK_SRC_DIR)/library/optMenu.tcl \
+- $(TK_SRC_DIR)/library/palette.tcl \
+- $(TK_SRC_DIR)/library/tearoff.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/bgerror.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/dialog.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/focus.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/obsolete.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/optMenu.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/palette.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/tearoff.tcl \
+ $(SRC_DIR)/generic/tk4.1/tk.tcl \
+- $(TK_SRC_DIR)/library/button.tcl \
+- $(TK_SRC_DIR)/library/entry.tcl \
+- $(TK_SRC_DIR)/library/listbox.tcl \
+- $(TK_SRC_DIR)/library/menu.tcl \
+- $(TK_SRC_DIR)/library/scale.tcl \
+- $(TK_SRC_DIR)/library/scrlbar.tcl \
+- $(TK_SRC_DIR)/library/text.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/button.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/entry.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/listbox.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/menu.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/scale.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/scrlbar.tcl \
++ $(TK_SRC_DIR)/../../lib/tk4.1/text.tcl \
+ $(SRC_DIR)/generic/tk4.1/console.tcl
+
+ TIX_SCRIPTS = \