36 lines
1.2 KiB
Text
36 lines
1.2 KiB
Text
Index: INSTALL
|
|
--- INSTALL.orig
|
|
+++ INSTALL
|
|
@@ -113,7 +113,7 @@ fi
|
|
if [ `uname` != Darwin ]; then
|
|
# Determine whether fontsrv X11 files are available.
|
|
rm -f a.out
|
|
- cc -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \
|
|
+ ${CC} -o a.out -c -Iinclude -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/local/include/freetype2 \
|
|
-I/usr/X11R7/include -I/usr/X11R7/include/freetype2 \
|
|
-I/usr/X11R6/include -I/usr/X11R6/include/freetype2 src/cmd/fontsrv/x11.c >/dev/null 2>&1
|
|
if [ -f a.out ]; then
|
|
@@ -139,7 +139,7 @@ echo "* Compiler version:"
|
|
cd src
|
|
if $dobuild; then
|
|
echo "* Building mk..."
|
|
- ../dist/buildmk 2>&1 | sed 's/^[+] //'
|
|
+ ../dist/buildmk 2>&1
|
|
|
|
if [ ! -x ../bin/mk ]; then
|
|
echo "* Error: mk failed to build."
|
|
@@ -147,7 +147,6 @@ if $dobuild; then
|
|
fi
|
|
|
|
echo "* Building everything (be patient)..."
|
|
- mk clean
|
|
mk libs-nuke
|
|
mk all || exit 1
|
|
if [ ! -x $PLAN9/src/cmd/o.cleanname -o ! -x $PLAN9/src/cmd/acme/o.acme ]; then
|
|
@@ -206,5 +205,5 @@ if $doinstall; then
|
|
echo " PLAN9=$PLAN9 export PLAN9"
|
|
echo ' PATH=$PATH:$PLAN9/bin export PATH'
|
|
fi
|
|
-) 2>&1 | tee install.log | $awk -f $PLAN9/dist/isum.awk -v 'copy='install.sum
|
|
+) 2>&1 | tee install.log
|
|
|