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
40 lines
1.6 KiB
From: Jo-Philipp Wich <jo@mein.io>
|
|
Date: Thu, 26 Jan 2017 15:31:00 +0100
|
|
Subject: [PATCH] make: do not invoke vnstat --showconfig
|
|
|
|
In a cross-compile setting we cannot invoke the complied target executable,
|
|
therfore commit out the --showconfig call in order to prevent make from
|
|
exiting with an error.
|
|
|
|
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
|
|
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -104,9 +104,9 @@ release: distcheck
|
|
ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
|
|
|
|
install-data-hook:
|
|
- $(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
|
|
- $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
|
|
- mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
|
|
+ #$(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
|
|
+ # $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
|
|
+ # mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
|
|
@echo
|
|
@echo "============================================================================"
|
|
@echo " Note: No service file has been installed for starting the daemon"
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -2051,9 +2051,9 @@ release: distcheck
|
|
ls -l $(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.gz
|
|
|
|
install-data-hook:
|
|
- $(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
|
|
- $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
|
|
- mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
|
|
+ #$(DESTDIR)$(bindir)/vnstat$(EXEEXT) --showconfig >vnstat.conf && \
|
|
+ # $(MKDIR_P) $(DESTDIR)$(sysconfdir) && \
|
|
+ # mv -f vnstat.conf $(DESTDIR)$(sysconfdir)/vnstat.conf
|
|
@echo
|
|
@echo "============================================================================"
|
|
@echo " Note: No service file has been installed for starting the daemon"
|