diff options
Diffstat (limited to 'src/cmd')
| -rw-r--r-- | src/cmd/devdraw/mkwsysrules.sh | 1 | ||||
| -rw-r--r-- | src/cmd/fontsrv/freetyperules.sh | 7 | ||||
| -rw-r--r-- | src/cmd/fontsrv/mkfile | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh index dde44c81..9c422261 100644 --- a/src/cmd/devdraw/mkwsysrules.sh +++ b/src/cmd/devdraw/mkwsysrules.sh @@ -45,6 +45,7 @@ fi echo 'WSYSTYPE='$WSYSTYPE echo 'X11='$X11 +echo 'X11H='$X11H if [ $WSYSTYPE = x11 ]; then echo 'CFLAGS=$CFLAGS '$X11H 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 |