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