diff options
| author | David Young <dyoung@hdfgroup.org> | 2019-11-12 17:14:29 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2019-11-12 17:14:29 (GMT) |
| commit | 78dfcd4658e9b2c00a6747d7f84dd8f570373e97 (patch) | |
| tree | 6395433597ab8e374f780072d643f6a57ec581f8 | |
| parent | 9fd1143ffde30ef0dd61368667ea0ce85b280cd4 (diff) | |
| parent | f1b39ad80e2fc0d0f4f6ecae2a9fb0ea436c34cc (diff) | |
| download | hdf5-78dfcd4658e9b2c00a6747d7f84dd8f570373e97.zip hdf5-78dfcd4658e9b2c00a6747d7f84dd8f570373e97.tar.gz hdf5-78dfcd4658e9b2c00a6747d7f84dd8f570373e97.tar.bz2 | |
Merge pull request #2036 in HDFFV/hdf5 from ~DYOUNG/netbsd:develop to develop
* commit 'f1b39ad80e2fc0d0f4f6ecae2a9fb0ea436c34cc':
Apparently, + has no special meaning, and neither does \+, in so-called "obsolete" / POSIX "basic" regular expressions. Also, not every version of `sed` out there supports the `-E` option. So delete the -E flag and use the regex `[^/][^/]*` instead of `[^/]+`.
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | c++/examples/run-c++-ex.sh.in | 2 | ||||
| -rw-r--r-- | examples/run-c-ex.sh.in | 2 | ||||
| -rw-r--r-- | fortran/examples/run-fortran-ex.sh.in | 2 | ||||
| -rw-r--r-- | hl/c++/examples/run-hlc++-ex.sh.in | 2 | ||||
| -rw-r--r-- | hl/examples/run-hlc-ex.sh.in | 2 |
6 files changed, 6 insertions, 5 deletions
@@ -136,6 +136,7 @@ ./config/linux-gnulibc2 ./config/lt_vers.am ./config/Makefile.am.blank +./config/netbsd ./config/pgi-fflags ./config/pgi-flags ./config/solaris diff --git a/c++/examples/run-c++-ex.sh.in b/c++/examples/run-c++-ex.sh.in index 08e9633..03e1eac 100644 --- a/c++/examples/run-c++-ex.sh.in +++ b/c++/examples/run-c++-ex.sh.in @@ -47,7 +47,7 @@ prefix=@prefix@ examplesdir=@examplesdir@ if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then echo $(echo ${examplesdir##${prefix}/} | \ - sed -E 's,[^/]+,..,g') + sed 's,[^/][^/]*,..,g') else echo $prefix fi diff --git a/examples/run-c-ex.sh.in b/examples/run-c-ex.sh.in index b561617..90d5c6a 100644 --- a/examples/run-c-ex.sh.in +++ b/examples/run-c-ex.sh.in @@ -46,7 +46,7 @@ prefix=@prefix@ examplesdir=@examplesdir@ if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then echo $(echo ${examplesdir##${prefix}/} | \ - sed -E 's,[^/]+,..,g') + sed 's,[^/][^/]*,..,g') else echo $prefix fi diff --git a/fortran/examples/run-fortran-ex.sh.in b/fortran/examples/run-fortran-ex.sh.in index e2b444f..81e54ea 100644 --- a/fortran/examples/run-fortran-ex.sh.in +++ b/fortran/examples/run-fortran-ex.sh.in @@ -47,7 +47,7 @@ prefix=@prefix@ examplesdir=@examplesdir@ if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then echo $(echo ${examplesdir##${prefix}/} | \ - sed -E 's,[^/]+,..,g') + sed 's,[^/][^/]*,..,g') else echo $prefix fi diff --git a/hl/c++/examples/run-hlc++-ex.sh.in b/hl/c++/examples/run-hlc++-ex.sh.in index e46534a..43831f5 100644 --- a/hl/c++/examples/run-hlc++-ex.sh.in +++ b/hl/c++/examples/run-hlc++-ex.sh.in @@ -47,7 +47,7 @@ prefix=@prefix@ examplesdir=@examplesdir@ if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then echo $(echo ${examplesdir##${prefix}/} | \ - sed -E 's,[^/]+,..,g') + sed 's,[^/][^/]*,..,g') else echo $prefix fi diff --git a/hl/examples/run-hlc-ex.sh.in b/hl/examples/run-hlc-ex.sh.in index ceb77dd..e6d0cc9 100644 --- a/hl/examples/run-hlc-ex.sh.in +++ b/hl/examples/run-hlc-ex.sh.in @@ -46,7 +46,7 @@ prefix=@prefix@ examplesdir=@examplesdir@ if [ ${examplesdir##${prefix}/} != ${examplesdir} ]; then echo $(echo ${examplesdir##${prefix}/} | \ - sed -E 's,[^/]+,..,g') + sed 's,[^/][^/]*,..,g') else echo $prefix fi |