From 6ca3d3f0cd4437922280724957dc1279e007da1f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 14 Jul 2009 21:25:05 -0400 Subject: 0.6.2 -- how come no one told me `make install' fails? --- configure | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 256a15b..793e347 100755 --- a/configure +++ b/configure @@ -10,6 +10,7 @@ # Originally written by Luke Shumaker . sourcedir=`dirname "$0"` +pre='./var.sed' while [ $# -gt 0 ]; do case "$1" in --*) @@ -35,9 +36,7 @@ while [ $# -gt 0 ]; do case "$1" in shift done -mkdir -p {out/rvs-core/lib,tmp} - -echo '#!/bin/sed -f' > tmp/var.sed +echo '#!/bin/sed -f' > "$pre" while read line; do var=`echo "$line" | cut -f 1 ` val=$(eval echo `echo "$line" | cut -f 2-`) # load from Variables file @@ -48,15 +47,21 @@ while read line; do var=`echo "$var" | sed 's:/:\\\\/:g'` val=`echo "$val" | sed 's:/:\\\\/:g'` - echo 's/$$'"${var}"'$\$/'"${val}"'/' >> tmp/var.sed + echo 's/$$'"${var}"'$\$/'"${val}"'/' >> "$pre" #sed -i.bak 's/$$'"${var}"'$\$/'"${val}"'/' "$files" unset var val done < "$sourcedir/Variables" -chmod +x tmp/var.sed -tmp/var.sed < "$sourcedir/Makefile.orig" > Makefile +chmod +x "$pre" +"$pre" < "$sourcedir/Makefile.orig" > Makefile n0='# DO NOT edit this file, it has been generated by configure, and will be' n1='# overwritten. Instead, edit the file `Makefile.orig'\' sourcedir=`echo "$sourcedir" | sed 's:/:\\\\/:g'` -sed -i -e "10 a$n0" -e "10 a$n1" -e "s/@@sourcedir@@/$sourcedir/" Makefile + pre=`echo "$pre" | sed 's:/:\\\\/:g'` +sed -i \ +-e "10 a$n0" \ +-e "10 a$n1" \ +-e "s/@@sourcedir@@/$sourcedir/" \ +-e "s/@@pre@@/$pre/" \ +Makefile -- cgit v1.2.3-2-g168b