X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=70f5fe0ab4d82e972e3e0904e5c0c6cb8f293235;hb=3f3ba4efe16c38860f9ec66c6219711af435e366;hp=48a82491d2869b010dc44088b823958441ab29fe;hpb=f95eacd0bd861178647b59253077d263a2c2eeee;p=rrdtool.git

diff --git a/configure.ac b/configure.ac
index 48a8249..70f5fe0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl
 dnl Inspiration from http://autoconf-archive.cryp.to
 
 dnl tell automake the this script is for rrdtool
-AC_INIT([rrdtool],[1.2rc1])
+AC_INIT([rrdtool],[1.2rc4])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([config.h])
@@ -20,14 +20,7 @@ dnl determine the type of system we are running on
 
 AC_SUBST(VERSION)
 
-dnl where we install our stuff ...
-if test -d /opt; then
-   xxpreinst=/opt
-else 
-   xxpreinst=/usr/local
-fi
-
-AC_PREFIX_DEFAULT( $xxpreinst/rrdtool-$PACKAGE_VERSION )
+AC_PREFIX_DEFAULT( /usr/local/rrdtool-$PACKAGE_VERSION )
 
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
@@ -316,7 +309,10 @@ AC_MSG_CHECKING(Perl Modules to build)
 AC_MSG_RESULT(${COMP_PERL:-No Perl Modules will be built})
 
 # Options to pass when configuring perl module
-PERL_MAKE_OPTIONS="PREFIX=$prefix LIB=$prefix/lib/perl/$PERL_VERSION"
+ppref=$prefix
+test "x$ppref" = xNONE && ppref=$ac_default_prefix
+
+PERL_MAKE_OPTIONS="PREFIX=$ppref LIB=$ppref/lib/perl/$PERL_VERSION"
 
 dnl pass additional perl options when generating Makefile from Makefile.PL
 AC_ARG_ENABLE(perl-site-install,