diff options
| author | Christian Kellermann <ckeen@pestilenz.org> | 2012-12-11 12:45:45 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2012-12-11 12:45:45 -0500 |
| commit | 1a512ec048a5c607a01b9fd82561c1601ba87406 (patch) | |
| tree | 60571e9860161ac608d7ba5b180fbb9e98469503 /src/cmd/fontsrv | |
| parent | 0b4fd921055175e9dda8c424f9252f4141507742 (diff) | |
| download | plan9port-1a512ec048a5c607a01b9fd82561c1601ba87406.tar.gz plan9port-1a512ec048a5c607a01b9fd82561c1601ba87406.tar.bz2 plan9port-1a512ec048a5c607a01b9fd82561c1601ba87406.zip | |
fontsrv: fix build on OpenBSD 5.2
R=rsc
CC=plan9port.codebot
https://codereview.appspot.com/6850108
Diffstat (limited to 'src/cmd/fontsrv')
| -rw-r--r-- | src/cmd/fontsrv/freetyperules.sh | 7 | ||||
| -rw-r--r-- | src/cmd/fontsrv/mkfile | 2 |
2 files changed, 7 insertions, 2 deletions
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 |