1 From 30e575f18416d67732be1e0350ee727b72b2d225 Mon Sep 17 00:00:00 2001
2 From: Romain Naour <romain.naour@openwide.fr>
3 Date: Sat, 27 Dec 2014 20:56:56 +0100
4 Subject: [PATCH] Remove unused libraries path
6 When building proto modules the path to library files is
7 specified with -L$(DESTDIR)$(pkgverlibdir) which point to
8 directory that doesn't exist.
10 Also, when cross-compiling and $(DESTDIR) is empty,
11 $(pkgverlibdir) contains a path to the host libraries
12 (/usr/lib/lftp/4.5.5) which is considered unsafe.
14 Anyway, those -L are not needed: by the time where
15 proto modules gets built/linked, no libraries are
16 installed in this location.
18 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
20 src/Makefile.am | 10 +++++-----
21 1 file changed, 5 insertions(+), 5 deletions(-)
23 diff --git a/src/Makefile.am b/src/Makefile.am
24 index d715d0a..0e221cf 100644
27 @@ -59,11 +59,11 @@ liblftp_pty_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir)
28 liblftp_network_la_LDFLAGS = -avoid-version -rpath $(pkgverlibdir) $(OPENSSL_LDFLAGS)
29 liblftp_network_la_LIBADD = $(SOCKSLIBS) $(OPENSSL_LIBS) $(LIBGNUTLS_LIBS) $(GNULIB)
31 -proto_ftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la
32 -proto_http_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la $(EXPAT_LIBS) $(ZLIB)
33 -proto_fish_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la
34 -proto_sftp_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la liblftp-pty.la
35 -cmd_torrent_la_LIBADD = -L$(DESTDIR)$(pkgverlibdir) liblftp-network.la
36 +proto_ftp_la_LIBADD = liblftp-network.la
37 +proto_http_la_LIBADD = liblftp-network.la $(EXPAT_LIBS) $(ZLIB)
38 +proto_fish_la_LIBADD = liblftp-network.la liblftp-pty.la
39 +proto_sftp_la_LIBADD = liblftp-network.la liblftp-pty.la
40 +cmd_torrent_la_LIBADD = liblftp-network.la
42 liblftp_tasks_la_SOURCES = PollVec.cc PollVec.h SMTask.cc SMTask.h ProcWait.cc\
43 ProcWait.h GetPass.cc GetPass.h ConnectionSlot.cc ConnectionSlot.h\