1The contrib directory now contains its own Makefile which is 2used during installation. It was required to pass DESTDIR through 3when it gets called from the base Makefile. 4 5Upstream-Status: Pending 6 7Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> 8--- 9 Makefile.in | 2 +- 10 contrib/Makefile.in | 6 +++--- 11 2 files changed, 4 insertions(+), 4 deletions(-) 12 13diff --git a/Makefile.in b/Makefile.in 14index 9434cbd..8da7d1f 100644 15--- a/Makefile.in 16+++ b/Makefile.in 17@@ -163,7 +163,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir) 18 test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install) 19 20 install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) 21- cd contrib/ && $(MAKE) install-utils 22+ cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils 23 $(INSTALL_BIN) $(top_builddir)/ftpcount $(DESTDIR)$(bindir)/ftpcount 24 $(INSTALL_BIN) $(top_builddir)/ftpdctl $(DESTDIR)$(bindir)/ftpdctl 25 $(INSTALL_SBIN) $(top_builddir)/ftpscrub $(DESTDIR)$(sbindir)/ftpscrub 26diff --git a/contrib/Makefile.in b/contrib/Makefile.in 27index d1a31af..65d2abc 100644 28--- a/contrib/Makefile.in 29+++ b/contrib/Makefile.in 30@@ -17,6 +17,6 @@ Makefile: Makefile.in ../config.status 31 cd ../ && ./config.status 32 33 install-utils: 34- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd 35- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail 36- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota 37+ $(INSTALL) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd 38+ $(INSTALL) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail 39+ $(INSTALL) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota 40