Renamed cf_write_item() to cf_modify_item().

[libucw.git] / ucw / autoconf.cfg

diff --git a/ucw/autoconf.cfg b/ucw/autoconf.cfg
index 8d295d7a19dde81095ba84ca09951a8c79b72f0f..854bd7b9cbd4917fcdf3f1f0047f51192131597e 100644 (file)
--- a/ucw/autoconf.cfg
+++ b/ucw/autoconf.cfg
@@ -9,12 +9,16 @@ if (IsSet("CONFIG_LOCAL")) {
        Log "local build\n";
        Set("INSTALL_PREFIX", "");
        Set("INSTALL_USR_PREFIX", "");
+       Set("INSTALL_VAR_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/"));
+       my $upx = ($ipx eq "" ? "/usr/" : "$ipx/");
+       Set("INSTALL_USR_PREFIX", $upx);
+       $upx =~ s{^/usr\b}{/var};
+       Set("INSTALL_VAR_PREFIX", $upx);
        Log Get("PREFIX") . "\n";
 }
 
@@ -26,6 +30,9 @@ 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');
+Set("INSTALL_LOG_DIR", '$(INSTALL_VAR_PREFIX)log');
+Set("INSTALL_STATE_DIR", '$(INSTALL_VAR_PREFIX)lib');
+Set("INSTALL_RUN_DIR", '$(INSTALL_VAR_PREFIX)run');
 
 ### OS ###
 
@@ -217,9 +224,9 @@ if (IsSet("CONFIG_LOCAL")) {
        Set("SONAME_PREFIX" => "");
 }
 if (IsSet("CONFIG_DARWIN")) {
-       Set("LSHARED" => '-dynamiclib -install_name $(SONAME_PREFIX)$(@F) -undefined dynamic_lookup');
+       Set("LSHARED" => '-dynamiclib -install_name $(SONAME_PREFIX)$(@F)$(SONAME_SUFFIX) -undefined dynamic_lookup');
 } else {
-       Set("LSHARED" => '-shared -Wl,-soname,$(SONAME_PREFIX)$(@F)');
+       Set("LSHARED" => '-shared -Wl,-soname,$(SONAME_PREFIX)$(@F)$(SONAME_SUFFIX)');
 }
 
 # Extra switches depending on GCC version: