bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[package] fix vnstat install usage on FreeBSD and MacOSX (#7718)

Browse Source 
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 <joe@roback.cc>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@22913 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2010-09-04 18:04:13 +00:00
parent 49c35ef1fc
commit a6de560e01
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
net/vnstat/patches/004-install_bsd_fix.patch Normal file
View File

@ -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 <joe@roback.cc>
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; \