README          |  2 +-

 doc/lftp.1      |  2 +-

 lftp.conf       |  3 +++

 src/Fish.cc     |  4 ++--

 src/Makefile.am | 23 +++++++++++++----------

 src/xdg-move    | 10 +++++-----

 6 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/README b/README

index 7c72f03..a236dd0 100644

--- a/README

+++ b/README

@@ -83,7 +83,7 @@ By GIT (development):

 	https://github.com/lavv17/lftp

 See also the home page `http://lftp.yar.ru/'.

-	

+

 Internals

 ~~~~~~~~~

diff --git a/doc/lftp.1 b/doc/lftp.1

index afe5586..4f37b9c 100644

--- a/doc/lftp.1

+++ b/doc/lftp.1

@@ -2313,7 +2313,7 @@ maximum time without any progress. When it's reached, the torrent shuts down.

 .BR torrent:use-dht \ (boolean)

 when true, DHT is used.

 .TP

-.BR xfer:auto-rename (boolean)

+.BR xfer:auto-rename \ (boolean)

 suggested filenames provided by the server are used if user explicitly sets

 this option to `on'. As this could be security risk, default is off.

 .TP

diff --git a/lftp.conf b/lftp.conf

index 719753d..f9b32dc 100644

--- a/lftp.conf

+++ b/lftp.conf

@@ -1,5 +1,8 @@

 ## some useful aliases

 alias dir ls

+alias l "ls -lt"

+alias cd.. "cd .."

+alias q quit

 alias less more

 alias zless zmore

 alias bzless bzmore

diff --git a/src/Fish.cc b/src/Fish.cc

index 868202e..4ffcf1c 100644

--- a/src/Fish.cc

+++ b/src/Fish.cc

@@ -585,7 +585,7 @@ int Fish::HandleReplies()

       }

       if(recv_buf->Eof())

       {

-	 LogError(0,_("Peer closed connection"));

+	 LogError(0,"%s",_("Peer closed connection"));

 	 // Solaris' shell exists when is given with wrong directory

 	 if(!RespQueueIsEmpty() && RespQueue[0]==EXPECT_CWD && message)

 	    SetError(NO_FILE,message);

@@ -631,7 +631,7 @@ int Fish::HandleReplies()

    if(RespQueueIsEmpty())

    {

-      LogError(3,_("extra server response"));

+      LogError(3,"%s",_("extra server response"));

       message.set(0);

       return m;

    }

diff --git a/src/Makefile.am b/src/Makefile.am

index 3ed14a0..4e728da 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -9,7 +9,7 @@ EXTRA_DIST = $(pkgdata_SCRIPTS) $(bin_SCRIPTS) $(noinst_SCRIPTS)

 lftp_SOURCES = lftp.cc complete.h complete.cc lftp_rl.c lftp_rl.h attach.cc attach.h

-TASK_MODULES = liblftp-pty.la liblftp-network.la proto-ftp.la proto-http.la proto-file.la proto-fish.la proto-sftp.la

+TASK_MODULES = liblftp-network.la liblftp-pty.la proto-ftp.la proto-http.la proto-file.la proto-fish.la proto-sftp.la

 JOB_MODULES = cmd-mirror.la cmd-sleep.la cmd-torrent.la

 if WITH_MODULES

   pkgverlib_LTLIBRARIES = $(TASK_MODULES) $(JOB_MODULES)

@@ -42,7 +42,7 @@ GNULIB = $(top_builddir)/lib/libgnu.la

 proto_ftp_la_LDFLAGS  = -module -avoid-version -rpath $(pkgverlibdir)

 proto_http_la_CPPFLAGS = $(AM_CPPFLAGS) $(EXPAT_CFLAGS)

-proto_http_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)

+proto_http_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir) $(ZLIB_LDFLAGS)

 proto_file_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)

 proto_fish_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)

 proto_sftp_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)

@@ -50,15 +50,19 @@ cmd_mirror_la_LDFLAGS = -module -avoid-version -rpath $(pkgverlibdir)

 cmd_sleep_la_LDFLAGS  = -module -avoid-version -rpath $(pkgverlibdir)

 cmd_torrent_la_LDFLAGS= -module -avoid-version -rpath $(pkgverlibdir)

 liblftp_pty_la_LDFLAGS     = -avoid-version -rpath $(pkgverlibdir)

+liblftp_pty_la_LIBADD      = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la liblftp-network.la

 liblftp_network_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENSSL_CPPFLAGS) $(ZLIB_CPPFLAGS) $(LIBGNUTLS_CFLAGS)

 liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir)

-liblftp_network_la_LIBADD  = $(SOCKSLIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS) $(GNULIB) $(ZLIB_LDFLAGS) $(ZLIB)

+liblftp_network_la_LIBADD  = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la $(SOCKSLIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS) $(GNULIB) $(ZLIB_LDFLAGS) $(ZLIB)

-proto_ftp_la_LIBADD  = liblftp-network.la

-proto_http_la_LIBADD = liblftp-network.la $(EXPAT_LDFLAGS) $(EXPAT_LIBS)

-proto_fish_la_LIBADD = liblftp-network.la liblftp-pty.la

-proto_sftp_la_LIBADD = liblftp-network.la liblftp-pty.la

-cmd_torrent_la_LIBADD  = liblftp-network.la

+proto_file_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la

+proto_ftp_la_LIBADD  = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la liblftp-network.la $(LIB_CRYPTO)

+proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la liblftp-network.la $(EXPAT_LIBS)

+proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la liblftp-network.la liblftp-pty.la

+proto_sftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-tasks.la liblftp-network.la liblftp-pty.la

+cmd_mirror_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-jobs.la liblftp-tasks.la

+cmd_sleep_la_LIBADD  = -L$(DESTDIR)$(pkgverlibdir) liblftp-jobs.la liblftp-tasks.la

+cmd_torrent_la_LIBADD  = -L$(DESTDIR)$(pkgverlibdir) liblftp-jobs.la liblftp-tasks.la liblftp-network.la $(LIB_CRYPTO)

 liblftp_tasks_la_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\

  ProcWait.h GetPass.cc GetPass.h ConnectionSlot.cc ConnectionSlot.h\

@@ -94,9 +98,8 @@ liblftp_jobs_la_SOURCES = Job.cc Job.h CmdExec.cc CmdExec.h\

 liblftp_jobs_la_LIBADD = $(JOB_MODULES_STATIC) liblftp-tasks.la

 lftp_CPPFLAGS = $(AM_CPPFLAGS) $(READLINE_CFLAGS)

-lftp_LDFLAGS = -export-dynamic

 lftp_LDADD = liblftp-jobs.la liblftp-tasks.la $(READLINE_LDFLAGS) $(READLINE_LIBS)

-lftp_DEPENDENCIES = liblftp-jobs.la

+lftp_DEPENDENCIES = liblftp-jobs.la liblftp-tasks.la $(READLINE_LIBS)

 CLEANFILES = *.la

diff --git a/src/xdg-move b/src/xdg-move

index 6b4b45f..dfd9af9 100755

--- a/src/xdg-move

+++ b/src/xdg-move

@@ -1,4 +1,4 @@

-#!/bin/bash

+#!/bin/sh

 #

 # This script moves ~/.lftp (or $LFTP_HOME) files to XDG directories.

 # ~/.lftp should be removed after execution of this script.

@@ -10,19 +10,19 @@ if ! [ -d "$src" ]; then

    exit 0

 fi

-function move() {

+move() {

    test -a "$src/$1" || return

    test -d "$2" || mkdir -p "$2" || exit 1

    mv "$src/$1" "$2/"

 }

-function move_data() {

+move_data() {

    move "$1" "${XDG_DATA_HOME:-$HOME/.local/share}/lftp"

 }

-function move_config() {

+move_config() {

    move "$1" "${XDG_CONFIG_HOME:-$HOME/.config}/lftp"

 }

-function move_cache() {

+move_cache() {

    move "$1" "${XDG_CACHE_HOME:-$HOME/.cache}/lftp"

 }