diff options
| author | Werner Lemberg <wl@gnu.org> | 2019-02-20 12:48:36 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2019-02-20 12:48:36 +0100 |
| commit | de8de1ce0e498b8cc9ae39e5a7d156100bcda99b (patch) | |
| tree | b384d9707c328e7bddd71cf3926481de983ab4df /builds | |
| parent | 0ac6921109aa78a26b874ad3a89b6ea0a209a7fc (diff) | |
| download | freetype2-de8de1ce0e498b8cc9ae39e5a7d156100bcda99b.tar.gz | |
Minor (whitespace, spelling, doc update).
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/freetype.mk | 37 | ||||
| -rw-r--r-- | builds/unix/configure.raw | 8 |
2 files changed, 23 insertions, 22 deletions
diff --git a/builds/freetype.mk b/builds/freetype.mk index fcb5d7eca..a9dce0dd3 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -298,21 +298,22 @@ PIP ?= pip refdoc: @echo Running docwriter... - $(PYTHON) -m docwriter \ - --prefix=ft2 \ - --title=FreeType-$(version) \ - --output=$(DOC_DIR) \ - $(PUBLIC_DIR)/*.h \ - $(PUBLIC_DIR)/config/*.h \ - $(PUBLIC_DIR)/cache/*.h + $(PYTHON) -m docwriter \ + --prefix=ft2 \ + --title=FreeType-$(version) \ + --output=$(DOC_DIR) \ + $(PUBLIC_DIR)/*.h \ + $(PUBLIC_DIR)/config/*.h \ + $(PUBLIC_DIR)/cache/*.h @echo Building static site... cd $(DOC_DIR) && mkdocs build @echo Done. -# Variables for running refdoc with Python's `virtualenv'. The env is -# created in `DOC_DIR/env' and is gitignored. -# We still need to cd into `DOC_DIR' to build mkdocs because paths in -# mkdocs.yml are relative to cwd. +# Variables for running `refdoc' with Python's `virtualenv'. The +# environment is created in `DOC_DIR/env' and is gitignored. +# +# We still need to cd into `DOC_DIR' to build `mkdocs' because paths in +# `mkdocs.yml' are relative to the current working directory. # VENV_NAME := env VENV_DIR := $(DOC_DIR)$(SEP)$(VENV_NAME) @@ -325,13 +326,13 @@ refdoc-venv: @echo Installing docwriter... $(ENV_PIP) install docwriter @echo Running docwriter... - $(ENV_PYTHON) -m docwriter \ - --prefix=ft2 \ - --title=FreeType-$(version) \ - --output=$(DOC_DIR) \ - $(PUBLIC_DIR)/*.h \ - $(PUBLIC_DIR)/config/*.h \ - $(PUBLIC_DIR)/cache/*.h + $(ENV_PYTHON) -m docwriter \ + --prefix=ft2 \ + --title=FreeType-$(version) \ + --output=$(DOC_DIR) \ + $(PUBLIC_DIR)/*.h \ + $(PUBLIC_DIR)/config/*.h \ + $(PUBLIC_DIR)/cache/*.h @echo Building static site... cd $(DOC_DIR) && $(VENV_NAME)$(SEP)$(BIN)$(SEP)python -m mkdocs build @echo Done. diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index e50aad638..ce788d708 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -37,7 +37,7 @@ AC_SUBST(EXEEXT) PKG_PROG_PKG_CONFIG([0.24]) LT_INIT(win32-dll) -AC_CHECK_HEADER([windows.h],[LT_PROG_RC]) +AC_CHECK_HEADER([windows.h], [LT_PROG_RC]) # checks for native programs to generate building tool @@ -196,7 +196,7 @@ AC_SYS_LARGEFILE AC_ARG_ENABLE([mmap], AS_HELP_STRING([--disable-mmap], [do not check mmap() and do not use]), - [enable_mmap="no"],[enable_mmap="yes"]) + [enable_mmap="no"], [enable_mmap="yes"]) if test "x${enable_mmap}" != "xno"; then AC_FUNC_MMAP fi @@ -315,7 +315,7 @@ found_visibility_flag=no AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) orig_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} -fvisibility=hidden" -AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], +AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [found_visibility_flag=yes AC_MSG_RESULT(yes)], [CFLAGS="${orig_CFLAGS}" @@ -325,7 +325,7 @@ if test "${found_visibility_flag}" = "no"; then AC_MSG_CHECKING([for -xldscope=hidden compiler flag]) orig_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} -xldscope=hidden" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [found_visibility_flag=yes AC_MSG_RESULT(yes)], [CFLAGS="${orig_CFLAGS}" |