1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
--- a/Makefile
+++ b/Makefile
@@ -10,15 +10,15 @@ clean :
install : all
- $(INSTALL) -m 0755 -d ${prefix}/bin
- $(INSTALL) -m 0755 src/nstreams ${prefix}/bin
- $(INSTALL) -m 0755 -d ${prefix}/man
- $(INSTALL) -m 0755 -d ${prefix}/man/man1
- $(INSTALL) -m 0444 docs/nstreams.1 ${prefix}/man/man1/
- if [ -f ${prefix}/etc/nstreams-services ]; then mv ${prefix}/etc/nstreams-services ${prefix}/etc/nstreams-services.old;fi
- $(INSTALL) -m 0644 docs/nstreams-services ${prefix}/etc/nstreams-services
- $(INSTALL) -m 0644 docs/nstreams-networks ${prefix}/etc/nstreams-networks.sample
-
+ $(INSTALL) -m 0755 -d ${DESTDIR}/${prefix}/bin
+ $(INSTALL) -m 0755 src/nstreams ${DESTDIR}${prefix}/bin
+ $(INSTALL) -m 0755 -d ${DESTDIR}${prefix}/share/man
+ $(INSTALL) -m 0755 -d ${DESTDIR}${prefix}/share/man/man1
+ $(INSTALL) -m 0444 docs/nstreams.1 ${DESTDIR}${prefix}/share/man/man1/
+ if [ -f ${DESTDIR}/${sysconfdir}/nstreams-services ]; then mv ${DESTDIR}${sysconfdir}/nstreams-services ${DESTDIR}${sysconfdir}/nstreams-services.old;fi
+ $(INSTALL) -m 0644 docs/nstreams-services ${DESTDIR}${sysconfdir}/nstreams/nstreams-services
+ $(INSTALL) -m 0644 docs/nstreams-networks ${DESTDIR}${sysconfdir}/nstreams/nstreams-networks
+
distclean : clean
rm -f includes/config.h config.cache config.status config.log nstreams.tmpl
--- a/configure.in
+++ b/configure.in
@@ -30,8 +30,8 @@ AC_CHECK_LIB(pcap, pcap_open_live,,AC_ER
test "$prefix" = NONE && prefix=/usr/local
sysconfdir=${prefix}/etc
-AC_DEFINE_UNQUOTED(ETC_NSTREAMS_NETWORKS, "${prefix}/etc/nstreams-networks")
-AC_DEFINE_UNQUOTED(ETC_NSTREAMS_SERVICES, "${prefix}/etc/nstreams-services")
+AC_DEFINE_UNQUOTED(ETC_NSTREAMS_NETWORKS, "${sysconfdir}/nstreams/nstreams-networks")
+AC_DEFINE_UNQUOTED(ETC_NSTREAMS_SERVICES, "${sysconfdir}/nstreams/nstreams-services")
AC_CHECK_FUNCS(bzero inet_ntoa)
AC_SUBST(PWDD)
AC_OUTPUT(nstreams.tmpl)
--- a/docs/nstreams.1
+++ b/docs/nstreams.1
@@ -1,6 +1,6 @@
.TH nstreams 1 "July 1999" "nstreams" "Users Manuals"
.SH NAME
-network streams - a tcpdump output analyzer
+nstreams \- a tcpdump output analyzer
.SH SYNOPSIS
.B nstreams
[ -v ] [ -c
--- a/nstreams.tmpl.in
+++ b/nstreams.tmpl.in
@@ -20,5 +20,7 @@ infodir=@infodir@
mandir=@mandir@
CC=@CC@
CFLAGS=@CFLAGS@ $(CWARN) -I$(includedir) -I$(rootdir)/includes
+LDFLAGS=@LDFLAGS@
DEFS=$(CFLAGS)
INSTALL=./install-sh -c
+DESTDIR=$(DESTDIR)
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ OBJS=nstreams.o parse_tcpdump.o config_r
networks.o output.o read_pcap.o
COMPILE=$(CC) $(CFLAGS)
-LIBS=-lpcap
+LIBS=-lpcap $(LDFLAGS)
all : nstreams
nstreams : $(OBJS)
|
