diff options
| author | mwesdorp <mwesdorp> | 2014-03-01 17:01:09 +0000 |
|---|---|---|
| committer | mwesdorp <mwesdorp> | 2014-03-01 17:01:09 +0000 |
| commit | c4fcec88ba2ee0c96f3a36c053c1fa5e855426ed (patch) | |
| tree | 7b631ef8b8f469431b9559c12158b729858b809f /scripts | |
| parent | d53419f61525c97f4018e5051617ea4a3d9b0b21 (diff) | |
sqsh-2.5 new features and bugfixes
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install.sh | 6 | ||||
| -rwxr-xr-x | scripts/install.sh.in | 2 | ||||
| -rwxr-xr-x | scripts/make_dist.sh | 2 | ||||
| -rw-r--r-- | scripts/make_wrapper.sh | 2 | ||||
| -rw-r--r-- | scripts/make_wrapper.sh.in | 5 |
5 files changed, 8 insertions, 9 deletions
diff --git a/scripts/install.sh b/scripts/install.sh index 5e8030a..e3d979f 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,6 +1,6 @@ #!/bin/sh -VERSION=2.1 +VERSION=2.5 # Determine how to use echo without a carriage return. # This is pretty much stolen from autoconf. @@ -211,7 +211,7 @@ do # install on. # x11_path="" - if [ "no" = "yes" ] + if [ "yes" = "yes" ] then x11_path="" for dir in \ @@ -259,7 +259,7 @@ do readline_path="" if [ "yes" = "yes" ] then - for dir in `echo # -L/lib | sed -e 's,^-L,,g'` \ + for dir in `echo | sed -e 's,^-L,,g'` \ /usr/local/lib /usr/lib do if [ -f $dir/libreadline.a -o \ diff --git a/scripts/install.sh.in b/scripts/install.sh.in index 0754958..98674a6 100755 --- a/scripts/install.sh.in +++ b/scripts/install.sh.in @@ -1,6 +1,6 @@ #!/bin/sh -VERSION=2.4 +VERSION=2.5 # Determine how to use echo without a carriage return. # This is pretty much stolen from autoconf. diff --git a/scripts/make_dist.sh b/scripts/make_dist.sh index b048c85..a0242cc 100755 --- a/scripts/make_dist.sh +++ b/scripts/make_dist.sh @@ -62,7 +62,7 @@ cp COPYING doc/README.bin $tmp_dir # Documentation files. # cp ChangeLog doc/FAQ doc/global.sqshrc doc/sample.sqsh_m4 \ - doc/sqsh.1 doc/sqsh.html doc/sqshrc-2.4 doc/CHANGES-2.* \ + doc/sqsh.1 doc/sqsh.html doc/sqshrc-2.5 doc/CHANGES* \ $tmp_dir/doc # diff --git a/scripts/make_wrapper.sh b/scripts/make_wrapper.sh index bfce756..e7be128 100644 --- a/scripts/make_wrapper.sh +++ b/scripts/make_wrapper.sh @@ -9,7 +9,7 @@ prefix=/usr/local exec_prefix=${prefix}/bin sybase=/opt/sybase/OCS-15_0 -readline_libdir='# -L/lib' +readline_libdir='' motif_libdir='' x_libdir='# -L/usr/X11R6/lib' diff --git a/scripts/make_wrapper.sh.in b/scripts/make_wrapper.sh.in index 53284f0..b2cdb51 100644 --- a/scripts/make_wrapper.sh.in +++ b/scripts/make_wrapper.sh.in @@ -7,8 +7,7 @@ fi prefix=@prefix@ exec_prefix=@exec_prefix@/bin -sybase=@SYBASE@ -sybase_ocos=@SYBASE_OCOS@ +sybase=@SYBASE_OCOS@ readline_libdir='@READLINE_LIBDIR@' motif_libdir='@MOTIF_LIBDIR@' @@ -18,7 +17,7 @@ readline_libdir=`echo $readline_libdir | sed -e 's,^#.*$,,g'` motif_libdir=`echo $motif_libdir | sed -e 's,^#.*$,,g'` x_libdir=`echo $x_libdir | sed -e 's,^#.*$,,g'` -LD_LIBRARY_PATH=$sybase_ocos/lib +LD_LIBRARY_PATH=$sybase/lib if [ "$readline_libdir" != "" ]; then readline_libdir=`echo $readline_libdir | sed -e 's,^-L,,g'` LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$readline_libdir" |