Merge 3.14.12.8 (+ the Travis fix) into 3.15

2018-09-17 16:15:55 -05:00
parent 6a2ed4b333 7dd1ea4cab
commit 150d764d28
25 changed files with 628 additions and 614 deletions
--- a/src/std/softIoc/makeInstallDir.pl
+++ b/src/std/softIoc/makeInstallDir.pl
@@ -1,5 +1,4 @@
-eval 'exec perl -S $0 ${1+"$@"}'  # -*- Mode: perl -*-
-    if $running_under_some_shell;
+#!/usr/bin/env perl
 #*************************************************************************
 # Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.