commit 67fa7175c51c6bd747678c4ce40a9646300321bb
parent e589533fcc5415d1b766aa358c71b13713e7042d
Author: Jordan Ritter <jpr5@darkridge.com>
Date: Sun, 28 Dec 2003 22:41:57 +0000
remove auto-generated file, and update installation portion to pay
attention to prefix stuff, as well as the DESTDIR kludge often used for
relocating the root of an entire installation without touching prefixes
Diffstat:
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Makefile.in b/Makefile.in
@@ -20,9 +20,12 @@ OBJS=ngrep.o
TARGET=ngrep
MANPAGE=ngrep.8
-INSTALL=./install-sh
-BINDEST=@prefix@/bin
-MANDEST=@prefix@/man/man8
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+BINDIR = @bindir@
+MANDIR = @mandir@/man8
+
+INSTALL = ./install-sh
REGEX_TARGET=@REGEX_TARGET@
REGEX_OBJS=@REGEX_OBJS@
@@ -40,8 +43,8 @@ static: $(OBJS)
$(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(LIBS)
install: $(TARGET)
- $(INSTALL) -c -m 0755 $(TARGET) $(BINDEST)
- $(INSTALL) -c -m 0644 $(MANPAGE) $(MANDEST)
+ $(INSTALL) -c -m 0755 $(TARGET) $(DESTDIR)/$(BINDIR)/$(TARGET)
+ $(INSTALL) -c -m 0644 $(MANPAGE) $(DESTDIR)/$(MANDIR)/$(MANPAGE)
pcre:
@( cd pcre-3.4; make $(REGEX_OBJS) && cp -f $(REGEX_OBJS) .. )
diff --git a/configure b/configure
@@ -271,6 +271,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT=
ac_unique_file="ngrep.c"
+ac_default_prefix=/usr/local
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ac_prefix_program CPP EGREP REGEX_TARGET REGEX_OBJS OS STRIPFLAG PCAP_INCLUDE PCAP_LINK EXTRA_DEFINES EXTRA_INCLUDES EXTRA_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
@@ -2214,6 +2215,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
if test "x$prefix" = xNONE; then
echo $ECHO_N "checking for prefix by $ECHO_C" >&6
# Extract the first word of "tcpdump", so it can be a program name with args.
diff --git a/configure.in b/configure.in
@@ -16,6 +16,7 @@ echo
AC_CANONICAL_SYSTEM
AC_PROG_CC
+AC_PREFIX_DEFAULT(/usr/local)
AC_PREFIX_PROGRAM(tcpdump)
AC_HEADER_STDC