You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

40 lines
1.6 KiB

  1. From: Jo-Philipp Wich <jo@mein.io>
  2. Date: Thu, 26 Jan 2017 15:31:00 +0100
  3. Subject: [PATCH] make: do not invoke vnstat --showconfig
  4. In a cross-compile setting we cannot invoke the complied target executable,
  5. therfore commit out the --showconfig call in order to prevent make from
  6. exiting with an error.
  7. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  8. --- a/Makefile.am
  9. +++ b/Makefile.am
  10. @@ -104,9 +104,9 @@ release: distcheck
  11. ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
  12. install-data-hook:
  13. - $(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
  14. - $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
  15. - mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
  16. + #$(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
  17. + # $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
  18. + # mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
  19. @echo
  20. @echo "============================================================================"
  21. @echo " Note: No service file has been installed for starting the daemon"
  22. --- a/Makefile.in
  23. +++ b/Makefile.in
  24. @@ -2051,9 +2051,9 @@ release: distcheck
  25. ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
  26. install-data-hook:
  27. - $(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
  28. - $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
  29. - mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
  30. + #$(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
  31. + # $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
  32. + # mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
  33. @echo
  34. @echo "============================================================================"
  35. @echo " Note: No service file has been installed for starting the daemon"