diff -NarU5 argus-2.0.6.fixes.1.orig/common/Makefile.in argus-2.0.6.fixes.1/common/Makefile.in
--- argus-2.0.6.fixes.1.orig/common/Makefile.in 2004-02-23 10:00:36.000000000 -0500
+++ argus-2.0.6.fixes.1/common/Makefile.in 2006-04-21 15:03:33.000000000 -0400
@@ -98,34 +98,28 @@
TAGHDR = bpf/net/bpf.h
TAGFILES = $(SRC) $(HDR) $(TAGHDR)
-LIBS = @INSTALL_LIB@/argus_parse.a @INSTALL_LIB@/argus_common.a
+LIBS = @INSTALL_LIB@/argus_common.a
-OBJ = $(COMMONOBJ) $(PARSEOBJ)
+OBJ = $(COMMONOBJ)
CLEANFILES = $(LIBS) $(OBJ) $(GENSRC) $(GENHDR) lex.yy.c
COMMONSRC = gencode.c argus_filter.c $(GENSRC)
COMMONOBJ = gencode.o argus_filter.o scanner.o grammar.o version.o
-PARSESRC = argus_parse.c argus_util.c argus_auth.c
-PARSEOBJ = argus_parse.o argus_util.o argus_auth.o
-SRC = $(COMMONSRC) $(PARSESRC)
+SRC = $(COMMONSRC)
all: $(LIBS)
@INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
rm -f $@; ar qc $@ $(COMMONOBJ)
-$(RANLIB) $@
-@INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
- rm -f $@; ar qc $@ $(PARSEOBJ)
- -$(RANLIB) $@
-
scanner.c: scanner.l
@rm -f $@
$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
scanner.o: scanner.c tokdefs.h
@@ -144,18 +138,16 @@
version.c: $(srcdir)/../VERSION
@rm -f $@
sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@
install: force
- [ -d $(LIBDEST) ] || \
- (mkdir -p $(LIBDEST); chmod 755 $(LIBDEST))
+ [ -d $(DESTDIR)/$(LIBDEST) ] || \
+ (mkdir -p $(DESTDIR)/$(LIBDEST); chmod 755 $(DESTDIR)/$(LIBDEST))
- $(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a
- $(INSTALL) $(srcdir)/../lib/argus_parse.a $(LIBDEST)/argus_parse.a
+ $(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a
- $(RANLIB) $(LIBDEST)/argus_common.a
- $(RANLIB) $(LIBDEST)/argus_parse.a
+ $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a
clean:
rm -f $(CLEANFILES)
distclean:
diff -NarU5 argus-2.0.6.fixes.1.orig/Makefile.in argus-2.0.6.fixes.1/Makefile.in
--- argus-2.0.6.fixes.1.orig/Makefile.in 2004-04-13 01:32:58.000000000 -0400
+++ argus-2.0.6.fixes.1/Makefile.in 2006-04-21 15:01:16.000000000 -0400
@@ -29,14 +29,14 @@
LIBS = @LIBS@
CFLAGS = -g
LDFLAGS = -g
-prefix = $(DESTDIR)@prefix@
+prefix = @prefix@
exec_prefix = @exec_prefix@
srcdir = @srcdir@
-docdir = $(prefix)/share/doc/argus-2.0
+#docdir = $(prefix)/share/doc/argus-2.0
#### End of system configuration section. ####
SHELL = /bin/sh
@@ -62,82 +62,82 @@
.PHONY: all
install: force
${MAKE} installdirs
- [ -d $(prefix) ] || \
- (mkdir -p $(prefix); chmod 755 $(prefix))
+ [ -d $(DESTDIR)/$(prefix) ] || \
+ (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix))
- [ -d @sbindir@ ] || \
- (mkdir -p @sbindir@; chmod 755 @sbindir@)
+ [ -d $(DESTDIR)/@sbindir@ ] || \
+ (mkdir -p $(DESTDIR)/@sbindir@; chmod 755 $(DESTDIR)/@sbindir@)
- [ -d $(exec_prefix)/argus ] || \
- (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus)
-
- [ -d $(exec_prefix)/argus/archive ] || \
- (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive)
-
- [ -d $(docdir) ] || \
- (mkdir -p $(docdir); chmod 755 $(docdir))
-
- [ -d $(docdir)/html ] || \
- (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html)
-
- [ -d $(docdir)/html/man ] || \
- (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man)
+# [ -d $(exec_prefix)/argus ] || \
+# (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus)
+#
+# [ -d $(exec_prefix)/argus/archive ] || \
+# (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive)
+#
+# [ -d $(docdir) ] || \
+# (mkdir -p $(docdir); chmod 755 $(docdir))
+#
+# [ -d $(docdir)/html ] || \
+# (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html)
+#
+# [ -d $(docdir)/html/man ] || \
+# (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man)
@-for d in $(DIRS); \
do \
(cd $$d; echo "### Make install in" `pwd`; \
$(MAKE) $(MFLAGS) install; \
echo "### Done with" `pwd`); \
done
- $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir)
- $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir)
- $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man
-
- $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus
- $(INSTALL) -m 0644 $(srcdir)/README $(docdir)
- $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus
- $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir)
-
- $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug
-
- [ -d @mandir@ ] || \
- (mkdir -p @mandir@; chmod 755 @mandir@)
- [ -d @mandir@/man1 ] || \
- (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1)
- [ -d @mandir@/man5 ] || \
- (mkdir -p @mandir@/man5; chmod 755 @mandir@/man5)
- [ -d @mandir@/man8 ] || \
- (mkdir -p @mandir@/man8; chmod 755 @mandir@/man8)
- $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 @mandir@/man5/argus.5
- $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 @mandir@/man5/argus.conf.5
- $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5
-
- $(INSTALL) -m 0644 $(srcdir)/man/man8/argus.8 @mandir@/man8/argus.8
-
- $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1
- $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1
- $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1
- $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1
- $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1
- $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1
- $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1
+# $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir)
+# $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir)
+# $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man
+#
+# $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus
+# $(INSTALL) -m 0644 $(srcdir)/README $(docdir)
+# $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus
+# $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir)
+#
+# $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug
+
+ [ -d $(DESTDIR)/@mandir@ ] || \
+ (mkdir -p $(DESTDIR)/@mandir@; chmod 755 $(DESTDIR)/@mandir@)
+# [ -d @mandir@/man1 ] || \
+# (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1)
+ [ -d $(DESTDIR)/@mandir@/man5 ] || \
+ (mkdir -p $(DESTDIR)/@mandir@/man5; chmod 755 $(DESTDIR)/@mandir@/man5)
+ [ -d $(DESTDIR)/@mandir@/man8 ] || \
+ (mkdir -p $(DESTDIR)/@mandir@/man8; chmod 755 $(DESTDIR)/@mandir@/man8)
+ $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 $(DESTDIR)/@mandir@/man5/argus.5
+ $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 $(DESTDIR)/@mandir@/man5/argus.conf.5
+# $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5
+
+ $(INSTALL) -m 0644 $(srcdir)/man/man8/argus.8 $(DESTDIR)/@mandir@/man8/argus.8
+
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1
+# $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1
uninstall:
- rm -f @mandir@/man5/argus.5
- rm -f @mandir@/man5/argus.conf.5
- rm -f @mandir@/man8/argus.8
-
- rm -rf $(docdir)
- rm -f $(exec_prefix)/argus/COPYING
- rm -f $(exec_prefix)/argus/README
+ rm -f $(DESTDIR)/@mandir@/man5/argus.5
+ rm -f $(DESTDIR)/@mandir@/man5/argus.conf.5
+ rm -f $(DESTDIR)/@mandir@/man8/argus.8
+
+# rm -rf $(docdir)
+# rm -f $(exec_prefix)/argus/COPYING
+# rm -f $(exec_prefix)/argus/README
installdirs:
- ${srcdir}/config/mkinstalldirs $(bindir) $(infodir)
+ ${srcdir}/config/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir)
Makefile: Makefile.in config.status
$(SHELL) config.status
config.status: configure
diff -NarU5 argus-2.0.6.fixes.1.orig/server/Makefile.in argus-2.0.6.fixes.1/server/Makefile.in
--- argus-2.0.6.fixes.1.orig/server/Makefile.in 2004-02-23 10:00:36.000000000 -0500
+++ argus-2.0.6.fixes.1/server/Makefile.in 2006-04-21 15:01:16.000000000 -0400
@@ -41,11 +41,11 @@
#
# Various configurable paths (remember to edit Makefile.in, not Makefile)
#
# Top level hierarchy
-prefix = $(DESTDIR)@prefix@
+prefix = @prefix@
exec_prefix = @exec_prefix@
# Pathname of directory to install the system binaries
SBINDIR = @sbindir@
# Pathname of directory to install the system binaries
BINDIR = @bindir@
@@ -131,16 +131,16 @@
@rm -f $@
sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@
install: force
- [ -d $(prefix) ] || \
- (mkdir -p $(prefix); chmod 755 $(prefix))
- [ -d $(SBINDIR) ] || \
- (mkdir -p $(SBINDIR); chmod 755 $(SBINDIR))
+ [ -d $(DESTDIR)/$(prefix) ] || \
+ (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix))
+ [ -d $(DESTDIR)/$(SBINDIR) ] || \
+ (mkdir -p $(DESTDIR)/$(SBINDIR); chmod 755 $(DESTDIR)/$(SBINDIR))
- $(INSTALL) $(srcdir)/../bin/argus_@V_PCAP@ $(SBINDIR)/argus
+ $(INSTALL) $(srcdir)/../bin/argus_@V_PCAP@ $(DESTDIR)/$(SBINDIR)/argus
clean:
rm -f $(CLEANFILES)
distclean: