Put configuration value to better place

diff --git a/ucw/perl/UCW/Configure/Paths.pm b/ucw/perl/UCW/Configure/Paths.pm
index b00300d2bb9b002ffbadd0b72f375c9f47c7d6eb..385987ca7dc938886730bb403e909feb40401c8d 100644 (file)
--- a/ucw/perl/UCW/Configure/Paths.pm
+++ b/ucw/perl/UCW/Configure/Paths.pm
@@ -37,5 +37,9 @@ Set("INSTALL_LOG_DIR", '$(INSTALL_VAR_PREFIX)log');
 Set("INSTALL_STATE_DIR", '$(INSTALL_VAR_PREFIX)lib');
 Set("INSTALL_RUN_DIR", '$(INSTALL_VAR_PREFIX)run');
 
+# 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
+
 1;

diff --git a/ucw/perl/UCW/Configure/UCW.pm b/ucw/perl/UCW/Configure/UCW.pm
index 6c7dc62dc47d723cc91fb59c72647ce756c78fb7..81a62f00169d1ebc41f6fc5d93cab4a29fd082d8 100644 (file)
--- a/ucw/perl/UCW/Configure/UCW.pm
+++ b/ucw/perl/UCW/Configure/UCW.pm
@@ -44,8 +44,4 @@ if (Get("CPU_ARCH") eq "default" || Get("CPU_ARCH") =~ /^i[345]86$/) {
 # If debugging memory allocations:
 #LIBS+=-lefence
 
-# 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"};
-
 1;