Commit 153f14c6 authored by David Goodell's avatar David Goodell
Browse files

[svn-r10821] tt#1771: allow `+` in `--prefix=`, etc.

Satish pointed out that we were causing problems when the user specified
directories with a `+` in them.  The updated version uses a `|`, which
is a universally poor user choice for directory names (much like `:`
would be).  Single quotes are now also used instead of double quotes.
This sed code is still pretty fragile in the case of exotic path names,
but it's better now.  If this is still a problem for users, the next
step is either to give up on permitting make-time overrides of special
vars like `prefix` or to at least disable that functionality with a
configure switch of some sort.

Reviewed by balaji@.
parent ca444829
...@@ -152,11 +152,11 @@ install-exec-hook: ...@@ -152,11 +152,11 @@ install-exec-hook:
for e in ${DESTDIR}${bindir}/mpicc ${DESTDIR}${bindir}/mpicxx \ for e in ${DESTDIR}${bindir}/mpicc ${DESTDIR}${bindir}/mpicxx \
${DESTDIR}${bindir}/mpif77 ${DESTDIR}${bindir}/mpif90 ; do \ ${DESTDIR}${bindir}/mpif77 ${DESTDIR}${bindir}/mpif90 ; do \
if test -e $${e} ; then \ if test -e $${e} ; then \
sed -e "s+^prefix=.*+prefix=${prefix}+g" \ sed -e 's|^prefix=.*|prefix=${prefix}|g' \
-e "s+^exec_prefix=.*+exec_prefix=${exec_prefix}+g" \ -e 's|^exec_prefix=.*|exec_prefix=${exec_prefix}|g' \
-e "s+^sysconfdir=.*+sysconfdir=${sysconfdir}+g" \ -e 's|^sysconfdir=.*|sysconfdir=${sysconfdir}|g' \
-e "s+^includdir=.*+includedir=${includedir}+g" \ -e 's|^includdir=.*|includedir=${includedir}|g' \
-e "s+^libdir=.*+libdir=${libdir}+g" $${e} > $${e}.tmp ; \ -e 's|^libdir=.*|libdir=${libdir}|g' $${e} > $${e}.tmp ; \
$(INSTALL_SCRIPT) $${e}.tmp $${e} ; \ $(INSTALL_SCRIPT) $${e}.tmp $${e} ; \
rm -f $${e}.tmp ; \ rm -f $${e}.tmp ; \
fi ; \ fi ; \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment