Permalink
Browse files

vbox: vboxmail is a tool for the admin, install to proper path

* bce267ea07dc70 cherry-picked from upstream
* remove some white-space from debian/vboxmail.enhanced
  • Loading branch information...
leggewie committed Apr 26, 2012
1 parent 50ee934 commit 95e086bb2bf0a2c3356b1afd8909a862936a5a8d
@@ -29,5 +29,3 @@
mv debian/tmp/usr/sbin/imon* debian/tmp/usr/bin/.
mv debian/tmp/usr/share/man/man8/imon.8 debian/tmp/usr/share/man/man1/imon.1
mv debian/tmp/usr/share/man/man8/imontty.8 debian/tmp/usr/share/man/man1/imontty.1
- # this _is_
- mv debian/tmp/usr/bin/vboxmail debian/tmp/usr/sbin/.
View
@@ -4,3 +4,4 @@ capiinit-conffile.patch
capiinit-fwpath.patch
libtool.patch
ipppd-replace-gpl-code.patch
+vbox-upstream-bce267ea07dc70.patch
@@ -0,0 +1,20 @@
+vboxmail should reside in /usr/sbin not /usr/bin
+
+picked from upstream bce267ea07dc70fc8015a4629277431c89ca7443
+patch can be dropped after next upstream release
+
+diff --git a/vbox/Makefile.in b/vbox/Makefile.in
+index a0ecdcf..54666e3 100644
+--- a/vbox/Makefile.in
++++ b/vbox/Makefile.in
+@@ -270,8 +270,8 @@ scripts-d: ignore
+ @cd $(TOPDIR)/utils && $(MAKE) distclean
+
+ scripts-i: ignore
+- @echo "Installing '$(DESTDIR)$(bindir)/vboxmail'..."
+- @$(INSTALL_SHBIN) $(TOPDIR)/utils/vboxmail $(DESTDIR)$(bindir)/vboxmail
++ @echo "Installing '$(DESTDIR)$(sbindir)/vboxmail'..."
++ @$(INSTALL_SHBIN) $(TOPDIR)/utils/vboxmail $(DESTDIR)$(sbindir)/vboxmail
+ @echo "Installing '$(DESTDIR)$(bindir)/vboxplay'..."
+ @$(INSTALL_SHBIN) $(TOPDIR)/utils/vboxplay $(DESTDIR)$(bindir)/vboxplay
+
View
@@ -40,7 +40,7 @@ onlynotify() {
) | /usr/sbin/sendmail -oi -t
}
-if [ ! -s "$MSNAME" ]; then
+if [ ! -s "$MSNAME" ]; then
onlynotify "message file appears to be missing!"
exit 0
fi

0 comments on commit 95e086b

Please sign in to comment.