Configure: Set installation paths based on PREFIX.

diff --git a/lib/autoconf.cfg b/lib/autoconf.cfg
index 8236265cbaf4d8a530510f78195f8d78205abfe7..277855fca40d5220a81d26ca45b98d0f0044d15e 100644 (file)
--- a/lib/autoconf.cfg
+++ b/lib/autoconf.cfg
@@ -2,20 +2,31 @@
 # (c) 2005--2008 Martin Mares <mj@ucw.cz>
 # (c) 2006 Robert Spalek <robert@ucw.cz>
 
-### Installation prefix ###
+### Installation paths ###
 
 Log "Determining installation prefix ... ";
 if (IsSet("CONFIG_LOCAL")) {
        Log "local build\n";
        Set("INSTALL_PREFIX", "");
+       Set("INSTALL_USR_PREFIX", "");
 } else {
        Set("PREFIX", "/usr/local") unless IsSet("PREFIX");
        my $ipx = Get("PREFIX");
        $ipx =~ s{/$}{};
        Set("INSTALL_PREFIX", "$ipx/");
+       Set("INSTALL_USR_PREFIX", ($ipx eq "" ? "/usr/" : "$ipx/"));
        Log Get("PREFIX") . "\n";
 }
 
+Set("INSTALL_CONFIG_DIR", '$(INSTALL_PREFIX)$(CONFIG_DIR)');
+Set("INSTALL_BIN_DIR", '$(INSTALL_USR_PREFIX)bin');
+Set("INSTALL_SBIN_DIR", '$(INSTALL_USR_PREFIX)sbin');
+Set("INSTALL_LIB_DIR", '$(INSTALL_USR_PREFIX)lib');
+Set("INSTALL_INCLUDE_DIR", '$(INSTALL_USR_PREFIX)include');
+Set("INSTALL_PKGCONFIG_DIR", '$(INSTALL_USR_PREFIX)lib/pkgconfig');
+Set("INSTALL_SHARE_DIR", '$(INSTALL_USR_PREFIX)share');
+Set("INSTALL_MAN_DIR", '$(INSTALL_USR_PREFIX)share/man');
+
 ### OS ###
 
 Test("OS", "Checking on which OS we run", sub {