fixed install target + prefix defaults to /usr/local/flood
git-svn-id: https://svn.apache.org/repos/asf/httpd/test/trunk/flood@96767 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/Makefile.in b/Makefile.in
index 3f3200a..e8402c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,6 +5,10 @@
builddir = $(shell pwd)
VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+
targets = flood
PROGRAMS = flood
diff --git a/build/rules.mk.in b/build/rules.mk.in
index 28ef3ea..de9b9e5 100644
--- a/build/rules.mk.in
+++ b/build/rules.mk.in
@@ -89,8 +89,8 @@
# Helper programs
-MKINSTALLDIRS = $(abs_srcdir)/build/mkdir.sh
-INSTALL = $(LIBTOOL) --mode=install $(abs_srcdir)/build/install.sh -c
+MKINSTALLDIRS = $(top_srcdir)/build/mkdir.sh
+INSTALL = $(LIBTOOL) --mode=install $(top_srcdir)/build/install.sh -c
INSTALL_DATA = $(INSTALL) -m 644
INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
@@ -197,9 +197,9 @@
local-install: $(TARGETS) $(SHARED_TARGETS) $(INSTALL_TARGETS)
@if test -n '$(PROGRAMS)'; then \
- test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
+ test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
list='$(PROGRAMS)'; for i in $$list; do \
- $(INSTALL_PROGRAM) $$i $(sbindir); \
+ $(INSTALL_PROGRAM) $$i $(bindir); \
done; \
fi
diff --git a/configure.in b/configure.in
index caddb13..90d03fb 100644
--- a/configure.in
+++ b/configure.in
@@ -4,8 +4,8 @@
dnl Location for config.guess, config.sub, install.sh, etc.
AC_CONFIG_AUX_DIR(build)
-dnl Override the default prefix with /pkg/flood-0.1
-AC_PREFIX_DEFAULT(/pkg/flood-0.1)
+dnl Override the default prefix with /usr/local/flood
+AC_PREFIX_DEFAULT(/usr/local/flood)
dnl m4 Macros from APR
sinclude(build/apr_common.m4)
