From 2117d3afb467d50381ac73f37232048e162f0ab8 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 4 Sep 2010 18:04:13 +0000 Subject: [PATCH] [package] fix vnstat install usage on FreeBSD and MacOSX (#7718) vnstat's makefile uses the '-D' option which is only part of GNU install, thus compiling vnstat for OpenWrt on FreeBSD or Mac OS X fails because of the missing option. Attached is a patch to have the install target separately create the destination directory before installing the vnstat.conf file to $(DEST)/etc. Additionally it also removes an erroneous tab character in the Makefile. The patch is meant to go in feeds/packages/net/vnstat/patches/ directory. TRAC Ticket: https://dev.openwrt.org/attachment/ticket/7718/ Signed-off-by: Joe Roback SVN-Revision: 22913 --- net/vnstat/patches/004-install_bsd_fix.patch | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 net/vnstat/patches/004-install_bsd_fix.patch diff --git a/net/vnstat/patches/004-install_bsd_fix.patch b/net/vnstat/patches/004-install_bsd_fix.patch new file mode 100644 index 0000000000..0b8aa22a11 --- /dev/null +++ b/net/vnstat/patches/004-install_bsd_fix.patch @@ -0,0 +1,33 @@ +vnstat's makefile uses the '-D' option which is only part of GNU install, thus compiling vnstat for OpenWrt on FreeBSD or Mac OS X fails because of the missing option. + +Attached is a patch to have the install target separately create the destination directory before installing the vnstat.conf file to $(DEST)/etc. Additionally it also removes an erroneous tab character in the Makefile. + +The patch is meant to go in feeds/packages/net/vnstat/patches/ directory. + +TRAC Ticket: https://dev.openwrt.org/attachment/ticket/7718/ + +Signed-off-by: Joe Roback + +Index: vnstat-1.10/Makefile +=================================================================== +--- a/Makefile 2010-08-06 23:32:29.000000000 -0600 ++++ b/Makefile 2010-08-06 23:35:27.000000000 -0600 +@@ -43,7 +43,8 @@ + # install default config if such doesn't exist + @if [ ! -f "$(DESTDIR)/etc/vnstat.conf" ]; \ + then echo "Installing config to $(DESTDIR)/etc/vnstat.conf"; \ +- install -D -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \ ++ install -d -m 755 $(DESTDIR)/etc; \ ++ install -m 644 cfg/vnstat.conf $(DESTDIR)/etc/vnstat.conf; \ + fi + + # install everything else +@@ -63,7 +64,7 @@ + then echo install -m 644 man/vnstati.1 $(MAN)/man1; \ + install -m 644 man/vnstati.1 $(MAN)/man1; \ + fi +- ++ + @if [ -f $(MAN)/man1/vnstat.1.gz ]; \ + then gzip -f9 $(MAN)/man1/vnstat.1; \ + gzip -f9 $(MAN)/man1/vnstatd.1; \ -- 2.30.2