Hello there!
The implementation of VPATH builds is incomplete. The attached changes
constitute the minimal set needed to build and install with success an
TLS-enabled server in version 1.3.5d on OpenIndiana, i.e., Solaris 2.11.
The difference is calculated against the Git repository. It would be of
benefit to see it incorporated into the new release.
Best regards,
Mats Erik Andersson
>From ae0eb18f717aeda7cc076d4287396c98704f8ff6 Mon Sep 17 00:00:00 2001
From: Mats Erik Andersson <[email protected]>
Date: Sat, 4 Feb 2017 23:04:30 +0100
Subject: [PATCH] Enable builds outside of source directory.
VPATH builds are broken without this minimal
set of additions. Verified with version 1.3.5d.
---
Make.rules.in | 2 +-
Makefile.in | 20 ++++++++++----------
configure.in | 2 +-
contrib/Makefile.in | 6 +++---
lib/Makefile.in | 1 +
src/Makefile.in | 1 +
utils/Makefile.in | 1 +
7 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in
index 55330b4..0868df9 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -46,7 +46,7 @@ RC_VERSION=@RC_VERSION@
# Directory include paths.
#
-INCLUDES=-I.. -I$(top_srcdir)/include @INCLUDES@
+INCLUDES=-I.. -I$(top_srcdir)/include -I$(top_builddir)/include @INCLUDES@
# Preprocessor compilation flags.
#
diff --git a/Makefile.in b/Makefile.in
index d1c2e96..1fa21dd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -152,7 +152,7 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
$(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut
$(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop
$(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho
- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs
install-conf: $(DESTDIR)$(sysconfdir)
if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \
@@ -165,18 +165,18 @@ install-libltdl:
cd lib/libltdl/ && $(MAKE) install
install-man: $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8
- $(INSTALL_MAN) $(top_srcdir)/src/ftpdctl.8 $(DESTDIR)$(mandir)/man8
- $(INSTALL_MAN) $(top_srcdir)/src/proftpd.8 $(DESTDIR)$(mandir)/man8
+ $(INSTALL_MAN) $(top_builddir)/src/ftpdctl.8 $(DESTDIR)$(mandir)/man8
+ $(INSTALL_MAN) $(top_builddir)/src/proftpd.8 $(DESTDIR)$(mandir)/man8
$(INSTALL_MAN) $(top_srcdir)/utils/ftpasswd.1 $(DESTDIR)$(mandir)/man1
$(INSTALL_MAN) $(top_srcdir)/utils/ftpmail.1 $(DESTDIR)$(mandir)/man1
$(INSTALL_MAN) $(top_srcdir)/utils/ftpquota.1 $(DESTDIR)$(mandir)/man1
- $(INSTALL_MAN) $(top_srcdir)/utils/ftpscrub.8 $(DESTDIR)$(mandir)/man8
- $(INSTALL_MAN) $(top_srcdir)/utils/ftpshut.8 $(DESTDIR)$(mandir)/man8
- $(INSTALL_MAN) $(top_srcdir)/utils/ftpcount.1 $(DESTDIR)$(mandir)/man1
- $(INSTALL_MAN) $(top_srcdir)/utils/ftptop.1 $(DESTDIR)$(mandir)/man1
- $(INSTALL_MAN) $(top_srcdir)/utils/ftpwho.1 $(DESTDIR)$(mandir)/man1
- $(INSTALL_MAN) $(top_srcdir)/src/proftpd.conf.5 $(DESTDIR)$(mandir)/man5
- $(INSTALL_MAN) $(top_srcdir)/src/xferlog.5 $(DESTDIR)$(mandir)/man5
+ $(INSTALL_MAN) $(top_builddir)/utils/ftpscrub.8 $(DESTDIR)$(mandir)/man8
+ $(INSTALL_MAN) $(top_builddir)/utils/ftpshut.8 $(DESTDIR)$(mandir)/man8
+ $(INSTALL_MAN) $(top_builddir)/utils/ftpcount.1 $(DESTDIR)$(mandir)/man1
+ $(INSTALL_MAN) $(top_builddir)/utils/ftptop.1 $(DESTDIR)$(mandir)/man1
+ $(INSTALL_MAN) $(top_builddir)/utils/ftpwho.1 $(DESTDIR)$(mandir)/man1
+ $(INSTALL_MAN) $(top_builddir)/src/proftpd.conf.5 $(DESTDIR)$(mandir)/man5
+ $(INSTALL_MAN) $(top_builddir)/src/xferlog.5 $(DESTDIR)$(mandir)/man5
install-all: install-proftpd install-modules install-utils install-conf install-man install-libs install-headers install-pkgconfig install-locales $(INSTALL_DEPS)
diff --git a/configure.in b/configure.in
index 57d9bea..4e693c7 100644
--- a/configure.in
+++ b/configure.in
@@ -87,7 +87,7 @@ if test $ac_cv_prog_gcc = no -a "$OSTYPE" = "-DHPUX10"; then
CFLAGS="$CFLAGS -Ae"
fi
-LDFLAGS="-L\$(top_srcdir)/lib $LDFLAGS"
+LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS"
if test $ac_cv_prog_gcc = yes; then
dnl Make sure to use the -rdynamic linker flag, for stacktraces
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index fc1b2d4..a5f439e 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -17,6 +17,6 @@ Makefile: Makefile.in ../config.status
cd ../ && ./config.status
install-utils:
- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd
- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota
+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd
+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail
+ $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota
diff --git a/lib/Makefile.in b/lib/Makefile.in
index b8b9e81..3c69a0c 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,5 +1,6 @@
@SET_MAKE@
+top_builddir=@top_builddir@
top_srcdir=@top_srcdir@
srcdir=@srcdir@
VPATH=@srcdir@
diff --git a/src/Makefile.in b/src/Makefile.in
index a27f5c2..076a221 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,7 @@
CC=@CC@
@SET_MAKE@
+top_builddir=@top_builddir@
top_srcdir=@top_srcdir@
srcdir=@srcdir@
VPATH=@srcdir@
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 6925d35..82eb89f 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,6 +1,7 @@
CC=@CC@
@SET_MAKE@
+top_builddir=@top_builddir@
top_srcdir=@top_srcdir@
srcdir=@srcdir@
VPATH=@srcdir@
--
2.11.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
ProFTPD Developers List
<[email protected]>
https://lists.sourceforge.net/lists/listinfo/proftp-devel
