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 `[^/]+`.
This commit is contained in:
1
MANIFEST
1
MANIFEST
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user