| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | The contrib directory now contains its own Makefile which is |
| 2 | used during installation. It was required to pass DESTDIR through |
| 3 | when it gets called from the base Makefile. |
| 4 | |
| 5 | Upstream-Status: Pending |
| 6 | |
| 7 | Signed-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 | |
| 13 | diff --git a/Makefile.in b/Makefile.in |
| 14 | index 5b2e683..ee72fe1 100644 |
| 15 | --- a/Makefile.in |
| 16 | +++ b/Makefile.in |
| 17 | @@ -120,7 +120,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) ftpcount $(DESTDIR)$(bindir)/ftpcount |
| 24 | $(INSTALL_BIN) ftpdctl $(DESTDIR)$(bindir)/ftpdctl |
| 25 | $(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub |
| 26 | diff --git a/contrib/Makefile.in b/contrib/Makefile.in |
| 27 | index 5bcc038..51d248c 100644 |
| 28 | --- a/contrib/Makefile.in |
| 29 | +++ b/contrib/Makefile.in |
| 30 | @@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status |
| 31 | cd ../ && ./config.status |
| 32 | |
| 33 | install-utils: |
| 34 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd |
| 35 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail |
| 36 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota |
| 37 | + $(INSTALL) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd |
| 38 | + $(INSTALL) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail |
| 39 | + $(INSTALL) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota |
| 40 | -- |
| 41 | 1.7.9.5 |
| 42 | |