| 1 |
--- blt2.4z/configure.in.libdir 2002-10-04 01:33:23.000000000 -0400 |
| 2 |
+++ blt2.4z/configure.in 2003-04-03 12:57:44.000000000 -0500 |
| 3 |
@@ -457,6 +457,12 @@ |
| 4 |
# ----------------------------------------------------------------------- |
| 5 |
AC_PATH_X |
| 6 |
|
| 7 |
+# Determine system libdir name |
| 8 |
+case $target in |
| 9 |
+ ppc64-*|sparc64-*|x86_64-*) LIB=lib64;; |
| 10 |
+ *) LIB=lib;; |
| 11 |
+esac |
| 12 |
+ |
| 13 |
# ----------------------------------------------------------------------- |
| 14 |
# |
| 15 |
# Find the Tcl build configuration file "tclConfig.sh" |
| 16 |
@@ -476,8 +482,8 @@ |
| 17 |
if test -r "$dir/tclConfig.sh" ; then |
| 18 |
tcl_config_sh="$dir/tclConfig.sh" |
| 19 |
break |
| 20 |
- elif test -r "$dir/lib/tclConfig.sh" ; then |
| 21 |
- tcl_config_sh="$dir/lib/tclConfig.sh" |
| 22 |
+ elif test -r "$dir/${LIB}/tclConfig.sh" ; then |
| 23 |
+ tcl_config_sh="$dir/${LIB}/tclConfig.sh" |
| 24 |
break |
| 25 |
elif test -r "$dir/$blt_platform/tclConfig.sh" ; then |
| 26 |
tcl_config_sh="$dir/$blt_platform/tclConfig.sh" |
| 27 |
@@ -498,8 +504,8 @@ |
| 28 |
if test -r "$dir/tclConfig.sh" ; then |
| 29 |
tcl_config_sh="$dir/tclConfig.sh" |
| 30 |
break |
| 31 |
- elif test -r "$dir/lib/tclConfig.sh" ; then |
| 32 |
- tcl_config_sh="$dir/lib/tclConfig.sh" |
| 33 |
+ elif test -r "$dir/${LIB}/tclConfig.sh" ; then |
| 34 |
+ tcl_config_sh="$dir/${LIB}/tclConfig.sh" |
| 35 |
break |
| 36 |
elif test -r "$dir/$blt_platform/tclConfig.sh" ; then |
| 37 |
tcl_config_sh="$dir/$blt_platform/tclConfig.sh" |
| 38 |
@@ -537,8 +543,8 @@ |
| 39 |
if test -r "$dir/tclConfig.sh" ; then |
| 40 |
tcl_config_sh="$dir/tclConfig.sh" |
| 41 |
break |
| 42 |
- elif test -r "$dir/lib/tclConfig.sh" ; then |
| 43 |
- tcl_config_sh="$dir/lib/tclConfig.sh" |
| 44 |
+ elif test -r "$dir/${LIB}/tclConfig.sh" ; then |
| 45 |
+ tcl_config_sh="$dir/${LIB}/tclConfig.sh" |
| 46 |
break |
| 47 |
fi |
| 48 |
done |
| 49 |
@@ -572,8 +578,8 @@ |
| 50 |
if test -r "$dir/tkConfig.sh" ; then |
| 51 |
tk_config_sh="$dir/tkConfig.sh" |
| 52 |
break |
| 53 |
- elif test -r "$dir/lib/tkConfig.sh" ; then |
| 54 |
- tk_config_sh="$dir/lib/tkConfig.sh" |
| 55 |
+ elif test -r "$dir/${LIB}/tkConfig.sh" ; then |
| 56 |
+ tk_config_sh="$dir/${LIB}/tkConfig.sh" |
| 57 |
break |
| 58 |
elif test -r "$dir/$blt_platform/tkConfig.sh" ; then |
| 59 |
tk_config_sh="$dir/$blt_platform/tkConfig.sh" |
| 60 |
@@ -595,8 +601,8 @@ |
| 61 |
if test -r "$dir/tkConfig.sh" ; then |
| 62 |
tk_config_sh="$dir/tkConfig.sh" |
| 63 |
break |
| 64 |
- elif test -r "$dir/lib/tkConfig.sh" ; then |
| 65 |
- tk_config_sh="$dir/lib/tkConfig.sh" |
| 66 |
+ elif test -r "$dir/${LIB}/tkConfig.sh" ; then |
| 67 |
+ tk_config_sh="$dir/${LIB}/tkConfig.sh" |
| 68 |
break |
| 69 |
elif test -r "$dir/$blt_platform/tkConfig.sh" ; then |
| 70 |
tk_config_sh="$dir/$blt_platform/tkConfig.sh" |
| 71 |
@@ -635,8 +641,8 @@ |
| 72 |
if test -r "$dir/tkConfig.sh" ; then |
| 73 |
tk_config_sh="$dir/tkConfig.sh" |
| 74 |
break |
| 75 |
- elif test -r "$dir/lib/tkConfig.sh" ; then |
| 76 |
- tk_config_sh="$dir/lib/tkConfig.sh" |
| 77 |
+ elif test -r "$dir/${LIB}/tkConfig.sh" ; then |
| 78 |
+ tk_config_sh="$dir/${LIB}/tkConfig.sh" |
| 79 |
break |
| 80 |
fi |
| 81 |
done |
| 82 |
@@ -752,11 +758,11 @@ |
| 83 |
fi |
| 84 |
else |
| 85 |
for libname in \ |
| 86 |
- "${TCL_EXEC_PREFIX}/lib/lib${TCL_LIB_NAME}.${SHLIB_SUFFIX}" \ |
| 87 |
- "${TCL_EXEC_PREFIX}/lib/lib${TCL_LIB_NAME}.a" |
| 88 |
+ "${TCL_EXEC_PREFIX}/${LIB}/lib${TCL_LIB_NAME}.${SHLIB_SUFFIX}" \ |
| 89 |
+ "${TCL_EXEC_PREFIX}/${LIB}/lib${TCL_LIB_NAME}.a" |
| 90 |
do |
| 91 |
if test -r "$libname" ; then |
| 92 |
- TCL_LIB_DIR="${TCL_EXEC_PREFIX}/lib" |
| 93 |
+ TCL_LIB_DIR="${TCL_EXEC_PREFIX}/${LIB}" |
| 94 |
break |
| 95 |
fi |
| 96 |
done |
| 97 |
@@ -782,11 +788,11 @@ |
| 98 |
fi |
| 99 |
else |
| 100 |
for libname in \ |
| 101 |
- "${TK_EXEC_PREFIX}/lib/lib${TK_LIB_NAME}.${SHLIB_SUFFIX}" \ |
| 102 |
- "${TK_EXEC_PREFIX}/lib/lib${TK_LIB_NAME}.a" |
| 103 |
+ "${TK_EXEC_PREFIX}/${LIB}/lib${TK_LIB_NAME}.${SHLIB_SUFFIX}" \ |
| 104 |
+ "${TK_EXEC_PREFIX}/${LIB}/lib${TK_LIB_NAME}.a" |
| 105 |
do |
| 106 |
if test -r "$libname" ; then |
| 107 |
- TK_LIB_DIR="${TK_EXEC_PREFIX}/lib" |
| 108 |
+ TK_LIB_DIR="${TK_EXEC_PREFIX}/${LIB}" |
| 109 |
break |
| 110 |
fi |
| 111 |
done |
| 112 |
@@ -851,7 +857,7 @@ |
| 113 |
# ----------------------------------------------------------------------- |
| 114 |
|
| 115 |
# Tk libraries |
| 116 |
-if test "${TK_LIB_DIR}" = "/usr/lib" ; then |
| 117 |
+if test "${TK_LIB_DIR}" = "${libdir}" ; then |
| 118 |
LIB_SPECS="${LIB_SPECS} ${TK_LIB_SPEC}" |
| 119 |
else |
| 120 |
LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_LIB_SPEC}" |
| 121 |
@@ -863,7 +869,7 @@ |
| 122 |
fi |
| 123 |
|
| 124 |
# Tcl libraries |
| 125 |
-if test "${TCL_LIB_DIR}" = "/usr/lib" -o \ |
| 126 |
+if test "${TCL_LIB_DIR}" = "${libdir}" -o \ |
| 127 |
"${TCL_LIB_DIR}" = "${TK_LIB_DIR}" ; then |
| 128 |
LIB_SPECS="${LIB_SPECS} ${TCL_LIB_SPEC}" |
| 129 |
else |
| 130 |
@@ -875,7 +881,7 @@ |
| 131 |
fi |
| 132 |
fi |
| 133 |
|
| 134 |
-if test "${TCL_LIB_DIR}" = "/usr/lib" ; then |
| 135 |
+if test "${TCL_LIB_DIR}" = "${libdir}" ; then |
| 136 |
TCL_ONLY_LIB_SPECS="${TCL_LIB_SPEC}" |
| 137 |
else |
| 138 |
TCL_ONLY_LIB_SPECS="-L${TCL_LIB_DIR} ${TCL_LIB_SPEC}" |
| 139 |
@@ -894,7 +900,7 @@ |
| 140 |
|
| 141 |
if test "x${x_libraries}" = "x" -o \ |
| 142 |
"x${x_libraries}" = "NONE" -o \ |
| 143 |
- "${x_libraries}" = "/usr/lib" -o \ |
| 144 |
+ "${x_libraries}" = "${libdir}" -o \ |
| 145 |
"${x_libraries}" = "${TK_LIB_DIR}" -o \ |
| 146 |
"${x_libraries}" = "${TCL_LIB_DIR}" ; then |
| 147 |
LIB_SPECS="${LIB_SPECS} -lX11" |
| 148 |
@@ -975,21 +981,6 @@ |
| 149 |
|
| 150 |
BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION} |
| 151 |
|
| 152 |
-# Add BLT to the run path |
| 153 |
-libdir=${exec_prefix}/lib |
| 154 |
- |
| 155 |
-if test "x${libdir}" != "x" -a \ |
| 156 |
- "${libdir}" != "/usr/lib" -a \ |
| 157 |
- "${libdir}" != "${x_libraries}" -a \ |
| 158 |
- "${libdir}" != "${TK_LIB_DIR}" -a \ |
| 159 |
- "${libdir}" != "${TCL_LIB_DIR}" ; then |
| 160 |
- if test "x${loader_run_path}" = "x" ; then |
| 161 |
- loader_run_path="${libdir}" |
| 162 |
- else |
| 163 |
- loader_run_path="${libdir}:${loader_run_path}" |
| 164 |
- fi |
| 165 |
-fi |
| 166 |
- |
| 167 |
aix_lib_specs="${aix_lib_specs} ${LIBS}" |
| 168 |
LIB_SPECS="${LIB_SPECS} ${LIBS}" |
| 169 |
TCL_ONLY_LIB_SPECS="${TCL_ONLY_LIB_SPECS} ${LIBS}" |
| 170 |
--- blt2.4z/library/Makefile.in~ 2003-04-03 14:10:10.000000000 -0500 |
| 171 |
+++ blt2.4z/library/Makefile.in 2003-04-03 14:10:47.000000000 -0500 |
| 172 |
@@ -8,7 +8,7 @@ |
| 173 |
lib_prefix = @BLT_LIB_PREFIX@ |
| 174 |
srcdir = @srcdir@ |
| 175 |
libdir = @libdir@ |
| 176 |
-scriptdir = @BLT_LIBRARY@ |
| 177 |
+scriptdir = $(libdir)/blt$(version) |
| 178 |
|
| 179 |
INSTALL = @INSTALL@ |
| 180 |
INSTALL_DATA = @INSTALL_DATA@ |
| 181 |
--- blt2.4z/demos/Makefile.in 2002-02-18 16:11:46.000000000 -0800 |
| 182 |
+++ blt2.4z/demos/Makefile.in.new 2008-12-04 13:43:30.000000000 -0800 |
| 183 |
@@ -6,7 +6,7 @@ |
| 184 |
exec_prefix = @exec_prefix@ |
| 185 |
version = @BLT_VERSION@ |
| 186 |
libdir = @libdir@ |
| 187 |
-scriptdir = $(prefix)/lib/blt$(version) |
| 188 |
+scriptdir = $(libdir)/blt$(version) |
| 189 |
destdir = $(scriptdir)/demos |
| 190 |
srcdir = @srcdir@ |
| 191 |
|
| 192 |
--- blt2.4z/Makefile.in 2002-02-18 16:11:43.000000000 -0800 |
| 193 |
+++ blt2.4z/Makefile.in.new 2008-12-04 13:44:42.000000000 -0800 |
| 194 |
@@ -13,7 +13,7 @@ |
| 195 |
includedir = @includedir@ |
| 196 |
libdir = @libdir@ |
| 197 |
version = @BLT_VERSION@ |
| 198 |
-scriptdir = $(prefix)/lib/blt$(version) |
| 199 |
+scriptdir = $(libdir)/blt$(version) |
| 200 |
|
| 201 |
instdirs = $(prefix) \ |
| 202 |
$(exec_prefix) \ |
Parent Directory
| 
Revision Log