Merge branch 'master' into dev-lib

[libucw.git] / ucw / perl / UCW / Configure / Paths.pm

diff --git a/ucw/perl/UCW/Configure/Paths.pm b/ucw/perl/UCW/Configure/Paths.pm
index 385987ca7dc938886730bb403e909feb40401c8d..bd22ca3d5f27eb13246543b53062a15b71630c14 100644 (file)
--- a/ucw/perl/UCW/Configure/Paths.pm
+++ b/ucw/perl/UCW/Configure/Paths.pm
@@ -1,12 +1,14 @@
-# Automatic configuration, installation paths part
-# (c) 2008 Michal Vaner <vorner@ucw.cz>
-# Code taken from autoconf.cfg by:
+# UCW Library configuration system: installation paths
 # (c) 2005--2008 Martin Mares <mj@ucw.cz>
 # (c) 2006 Robert Spalek <robert@ucw.cz>
+# (c) 2008 Michal Vaner <vorner@ucw.cz>
 
 package UCW::Configure::Paths;
 use UCW::Configure;
 
+use strict;
+use warnings;
+
 Log "Determining installation prefix ... ";
 if (IsSet("CONFIG_LOCAL")) {
        Log("local build\n");
@@ -36,10 +38,12 @@ 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');
+Set("INSTALL_DOC_DIR", '$(INSTALL_USR_PREFIX)share/doc');
+Set("INSTALL_PERL_DIR", '$(INSTALL_LIB_DIR)/perl5');
 
 # Remember PKG_CONFIG_PATH used for building, so that it will be propagated to
 # pkg-config's run locally in the makefiles.
 Set("PKG_CONFIG_PATH", $ENV{"PKG_CONFIG_PATH"}) if defined $ENV{"PKG_CONFIG_PATH"};
-# We succeeded
 
+# We succeeded
 1;