← Back to branch summary

~swag/armagetronad/0.2.9-sty+ct+ap-fork

« back to all changes in this revision

Viewing changes to batch/make/uninstall

  • Committer: z-man
  • Date: 2011-07-19 12:09:41 UTC
  • mto: (563.48.4 armagetronad)
  • mto: This revision was merged to the branch mainline in revision 731.
  • Revision ID: svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Fbranches%2F0.2.8%2Farmagetronad:9566
Fixing uninstall script generation recursion if DESTDIR is set at configure time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
batch/make/uninstall
41
41
DEST=$(pwd)/.foruninstall
42
42
 
43
43
# test for recursion
44
 
if echo ${DESTDIR} | grep ${DEST}; then
 
44
if echo ${DESTDIR} | grep "\.foruninstall$"; then
45
45
   echo "Recursion detected, aborting."
46
46
   exit 0
47
47
fi
48
48
 
49
 
if DESTDIR=${DEST} ${MAKE} install > /dev/null; then
 
49
if ${MAKE} DESTDIR=${DEST} install > /dev/null; then
50
50
echo "Success!"
51
51
else
52
52
echo "Failure :("