Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit 572e940

Browse files
author
Matthias Koeppe
committed
Substitute full @SAGE_LOCAL@ in autofoo scripts instead of referring to $SAGE_LOCAL
1 parent c5dadf9 commit 572e940

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build/pkgs/autotools/autofoo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ if [ -z "$v" ]; then
2222
fi
2323

2424
prog=`basename "$0"`
25-
exec "$SAGE_LOCAL/@AUTOFOO@-$v/bin/$prog" "$@"
25+
exec "@SAGE_LOCAL@/@AUTOFOO@-$v/bin/$prog" "$@"

build/pkgs/autotools/spkg-install

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ for x in $libtool_versions; do libtool_latest=$x ; done
6969
# We install scripts for autoconf,... based on the generic "autofoo" script
7070
cd "$SAGE_LOCAL/bin"
7171
sed <"$SRC/../autofoo" >autoconf \
72-
"s/@AUTOFOO@/autoconf/; s/@AUTOFILES@/configure/; s/@AUTOVAR@/AUTOCONF_VERSION/; s/@DEFAULT_VERSION@/${autoconf_latest}/"
72+
"s/@AUTOFOO@/autoconf/; s/@AUTOFILES@/configure/; s/@AUTOVAR@/AUTOCONF_VERSION/; s/@DEFAULT_VERSION@/${autoconf_latest}/; s|@SAGE_LOCAL@|$SAGE_LOCAL|;"
7373
sed <"$SRC/../autofoo" >automake \
74-
"s/@AUTOFOO@/automake/; s/@AUTOFILES@/Makefile.in/; s/@AUTOVAR@/AUTOMAKE_VERSION/; s/@DEFAULT_VERSION@/${automake_latest}/"
74+
"s/@AUTOFOO@/automake/; s/@AUTOFILES@/Makefile.in/; s/@AUTOVAR@/AUTOMAKE_VERSION/; s/@DEFAULT_VERSION@/${automake_latest}/; s|@SAGE_LOCAL@|$SAGE_LOCAL|;"
7575
sed <"$SRC/../autofoo" >libtool \
76-
"s/@AUTOFOO@/libtool/; s/@AUTOFILES@/ltmain.sh/; s/@AUTOVAR@/LIBTOOL_VERSION/; s/@DEFAULT_VERSION@/${libtool_latest}/"
76+
"s/@AUTOFOO@/libtool/; s/@AUTOFILES@/ltmain.sh/; s/@AUTOVAR@/LIBTOOL_VERSION/; s/@DEFAULT_VERSION@/${libtool_latest}/; s|@SAGE_LOCAL@|$SAGE_LOCAL|;"
7777

7878
# Correct permissions
7979
for prog in autoconf automake libtool; do

0 commit comments

Comments
 (0)