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