From 1a512ec048a5c607a01b9fd82561c1601ba87406 Mon Sep 17 00:00:00 2001 From: Christian Kellermann Date: Tue, 11 Dec 2012 12:45:45 -0500 Subject: fontsrv: fix build on OpenBSD 5.2 R=rsc CC=plan9port.codebot https://codereview.appspot.com/6850108 --- src/cmd/fontsrv/freetyperules.sh | 7 ++++++- src/cmd/fontsrv/mkfile | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/cmd/fontsrv') diff --git a/src/cmd/fontsrv/freetyperules.sh b/src/cmd/fontsrv/freetyperules.sh index ca7a0261..7b9a002f 100644 --- a/src/cmd/fontsrv/freetyperules.sh +++ b/src/cmd/fontsrv/freetyperules.sh @@ -1,7 +1,12 @@ #!/bin/sh if [ "x$1" = "xx11" ]; then - echo 'CFLAGS=$CFLAGS -I/usr/include/freetype2' + if [ "x$2" = "x" ]; then + i=/usr/include + else + i=$2 + fi + echo 'CFLAGS=$CFLAGS '$i'/freetype2' echo 'LDFLAGS=$LDFLAGS -lfontconfig -lfreetype -lz' fi diff --git a/src/cmd/fontsrv/mkfile b/src/cmd/fontsrv/mkfile index 9fbbd520..eed0355a 100644 --- a/src/cmd/fontsrv/mkfile +++ b/src/cmd/fontsrv/mkfile @@ -1,6 +1,6 @@ <$PLAN9/src/mkhdr <|sh ../devdraw/mkwsysrules.sh -<|sh freetyperules.sh $WSYSTYPE +<|sh freetyperules.sh $WSYSTYPE $X11H TARG=fontsrv -- cgit v1.2.3