convertRelease: Restore $Bin to @INC
This is needed when convertRelease.pl gets run before the EPICS::Path and EPICS::Release modules are installed, and after 'make uninstall' has deleted the lib/perl directory.
This commit is contained in:
+1
-5
@@ -58,12 +58,8 @@ include $(CONFIG)/CONFIG_BASE_VERSION
|
||||
include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
|
||||
-include $(CONFIG)/os/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
|
||||
|
||||
# Parse configure/RELEASE
|
||||
# except when building Base itself, where this file is empty,
|
||||
# and would error in src/tools/ anyway.
|
||||
ifndef BASE_TOP
|
||||
# Parse configure/RELEASE to find all upstream modules
|
||||
RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
|
||||
endif
|
||||
|
||||
ifdef T_A
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ use Getopt::Std;
|
||||
$Getopt::Std::STANDARD_HELP_VERSION = 1;
|
||||
|
||||
use FindBin qw($Bin);
|
||||
use lib ("$Bin/../../lib/perl");
|
||||
use lib ("$Bin/../../lib/perl", $Bin);
|
||||
|
||||
use EPICS::Path;
|
||||
use EPICS::Release;
|
||||
|
||||
Reference in New Issue
Block a user