Merge pull request epicsdeb#9 from mark0n/find-EpicsHostArch.pl

Fix EpicsHostArch.pl path for Base >=3.15.6
daykin · Oct 29, 2018 · fb87203 · fb87203
2 parents 34807ad + c34f924
commit fb87203
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+epics-debhelper (8.18) unstable; urgency=medium
+
+  * Fix EPICS_HOST_ARCH.pl path for Base >=3.15.6
+
+ -- Martin Konrad <[email protected]>  Tue, 16 Oct 2018 09:43:48 -0400
+
 epics-debhelper (8.17) unstable; urgency=medium
 
   [ Michael Davidsaver ]

diff --git a/lib/Debian/Debhelper/Dh_Epics.pm b/lib/Debian/Debhelper/Dh_Epics.pm
@@ -18,7 +18,16 @@ sub setepicsenv {
         $ENV{EPICS_BASE} = "/usr/lib/epics";
     }
     if (not exists $ENV{EPICS_HOST_ARCH}) {
-        $ENV{EPICS_HOST_ARCH} = `$ENV{EPICS_BASE}/startup/EpicsHostArch.pl`;
+        my $EHA_PATH;
+        if (-r "$ENV{EPICS_BASE}/lib/perl/EpicsHostArch.pl") {
+            $EHA_PATH = "$ENV{EPICS_BASE}/lib/perl/EpicsHostArch.pl";
+        } elsif (-r "$ENV{EPICS_BASE}/src/tools/EpicsHostArch.pl") {
+            $EHA_PATH = "$ENV{EPICS_BASE}/src/tools/EpicsHostArch.pl";
+        } else {
+            $EHA_PATH = "$ENV{EPICS_BASE}/startup/EpicsHostArch.pl";
+        }
+        $ENV{EPICS_HOST_ARCH} = `/usr/bin/perl ${EHA_PATH}`;
+        chomp($ENV{EPICS_HOST_ARCH});
     }
 }