From 58ab1f9ffac67f884809115198177bce94204b4d Mon Sep 17 00:00:00 2001 From: Michal Vaner Date: Fri, 17 Oct 2008 12:05:59 +0200 Subject: [PATCH] Put configuration value to better place --- ucw/perl/UCW/Configure/Paths.pm | 4 ++++ ucw/perl/UCW/Configure/UCW.pm | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ucw/perl/UCW/Configure/Paths.pm b/ucw/perl/UCW/Configure/Paths.pm index b00300d2..385987ca 100644 --- 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 6c7dc62d..81a62f00 100644 --- 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; -- 2.39.2