From: Martin Mares <mj@ucw.cz>
Date: Wed, 25 Jun 2008 15:01:00 +0000 (+0200)
Subject: Revert "Configure: Set installation paths based on PREFIX."
X-Git-Tag: holmes-import~404^2~5
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=fe51f3e91a6b400faae7a24929bd1a97c1d0876a;p=libucw.git

Revert "Configure: Set installation paths based on PREFIX."

This reverts commit 6c6d5d754582421419bc9e8d5c36036b7cfc1143,
which should have belonged to the dev-lib branch instead.
---

diff --git a/lib/autoconf.cfg b/lib/autoconf.cfg
index 9bb30219..28f11843 100644
--- a/lib/autoconf.cfg
+++ b/lib/autoconf.cfg
@@ -1,32 +1,7 @@
 # Automatic configuration of the UCW Library
-# (c) 2005--2008 Martin Mares <mj@ucw.cz>
+# (c) 2005--2007 Martin Mares <mj@ucw.cz>
 # (c) 2006 Robert Spalek <robert@ucw.cz>
 
-### 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 {