argus-3.0.0.rc.9 and argus-clients-3.0.0.rc.7

[Gabriel L. Somlo]

On Fri, Jun 16, 2006 at 04:04:08PM +0200, Robin Gruyters wrote:
> Quoting Carter Bullard <carter at qosient.com>:
> 
> >Hmmmm,
> >    So whats up with taking out the '-D' option to install?
> >
> Like I said, It doesn't work on FreeBSD. (at least not on 5.4)

I've attached a patch against argus-3.0.0.rc.10 which avoids having to
use -D with install, but otherwise accomplishes the exact same effect.

HTH,
Gabriel
-------------- next part --------------
diff -NarU5 argus-3.0.0.rc.10.orig/Makefile.in argus-3.0.0.rc.10/Makefile.in
--- argus-3.0.0.rc.10.orig/Makefile.in	2006-06-16 10:00:57.000000000 -0400
+++ argus-3.0.0.rc.10/Makefile.in	2006-06-16 13:37:17.000000000 -0400
@@ -67,10 +67,13 @@
 		(mkdir -p $(DESTDIR)@prefix@; chmod 755 $(DESTDIR)@prefix@)
 
 	[ -d $(DESTDIR)@sbindir@ ] || \
 		(mkdir -p $(DESTDIR)@sbindir@; chmod 755 $(DESTDIR)@sbindir@)
 
+	[ -d $(DESTDIR)@bindir@ ] || \
+		(mkdir -p $(DESTDIR)@bindir@; chmod 755 $(DESTDIR)@bindir@)
+
 	[ -d $(DESTDIR)$(exec_prefix)/argus ] || \
 		(mkdir -p $(DESTDIR)$(exec_prefix)/argus; chmod 755 $(DESTDIR)$(exec_prefix)/argus)
 
 	[ -d $(DESTDIR)$(exec_prefix)/argus/archive ] || \
 		(mkdir -p $(DESTDIR)$(exec_prefix)/argus/archive; chmod 755 $(DESTDIR)$(exec_prefix)/argus/archive)
@@ -91,11 +94,11 @@
 	$(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(prefix)/argus
 	$(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)$(docdir)
 	$(INSTALL) -m 0644 $(srcdir)/COPYING $(DESTDIR)$(prefix)/argus
 	$(INSTALL) -m 0644 $(srcdir)/COPYING $(DESTDIR)$(docdir)
 
-	$(INSTALL) -m 0755 -D $(srcdir)/bin/argusbug $(DESTDIR)@bindir@/argusbug
+	$(INSTALL) -m 0755 $(srcdir)/bin/argusbug $(DESTDIR)@bindir@/argusbug
 
 	[ -d $(DESTDIR)@mandir@ ] || \
 		(mkdir -p $(DESTDIR)@mandir@; chmod 755 $(DESTDIR)@mandir@)
 	[ -d $(DESTDIR)@mandir@/man5 ] || \
 		(mkdir -p $(DESTDIR)@mandir@/man5; chmod 755 $(DESTDIR)@mandir@/man5)