diff options
author | Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> | 2020-03-22 23:29:51 +0530 |
---|---|---|
committer | Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> | 2020-03-22 23:29:51 +0530 |
commit | 13c0df80dca59ce2ef3ec125b08c5b6ea485535c (patch) | |
tree | 8303bf38f1e6a027d3b2fcfe61572a7255175b6d | |
parent | 1fd3148713def5fe72ff6844a33e4fc896a80780 (diff) | |
download | freetype2-13c0df80dca59ce2ef3ec125b08c5b6ea485535c.tar.gz |
[docs] Fix building docs if `srcdir' != `builddir'.
`docs/reference/*' was moved one directory up in commit 237fed6.
* builds/unix/unix-def.in (PIP): Remove variable.
* configure: Create `docs' directory and copy assets from
`docs/markdown'.
* docs/README: Output directory is `reference'.
-rw-r--r-- | ChangeLog | 13 | ||||
-rw-r--r-- | builds/unix/unix-def.in | 1 | ||||
-rwxr-xr-x | configure | 8 | ||||
-rw-r--r-- | docs/README | 2 |
4 files changed, 18 insertions, 6 deletions
@@ -1,3 +1,16 @@ +2020-03-22 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> + + [docs] Fix building docs if `srcdir' != `builddir'. + + `docs/reference/*' was moved one directory up in commit 237fed6. + + * builds/unix/unix-def.in (PIP): Remove variable. + + * configure: Create `docs' directory and copy assets from + `docs/markdown'. + + * docs/README: Output directory is `reference'. + 2020-03-21 Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com> [docwriter] Drop support for Python < 3.5. diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in index 5675c24b8..5e04f1c6a 100644 --- a/builds/unix/unix-def.in +++ b/builds/unix/unix-def.in @@ -24,7 +24,6 @@ SEP := / # This is used for `make refdoc' and `make refdoc-venv' # PYTHON := @PYTHON@ -PIP := @PIP@ BIN := bin # this is used for `make distclean' and `make install' @@ -94,10 +94,10 @@ inode_src=`ls -id $abs_ft2_dir | awk '{print $1}'` inode_dst=`ls -id $abs_curr_dir | awk '{print $1}'` if test $inode_src -ne $inode_dst; then - if test ! -d reference; then - mkdir reference + if test ! -d docs; then + mkdir docs echo "Copying documentation assets" - cp -R $abs_ft2_dir/docs/reference/markdown $abs_curr_dir/reference + cp -R $abs_ft2_dir/docs/markdown $abs_curr_dir/docs fi if test ! -r $abs_curr_dir/modules.cfg; then echo "Copying \`modules.cfg'" @@ -107,7 +107,7 @@ if test $inode_src -ne $inode_dst; then echo "TOP_DIR := $abs_ft2_dir" > Makefile echo "OBJ_DIR := $abs_curr_dir" >> Makefile echo "OBJ_BUILD := \$(OBJ_DIR)" >> Makefile - echo "DOC_DIR := \$(OBJ_DIR)/reference" >> Makefile + echo "DOC_DIR := \$(OBJ_DIR)/docs" >> Makefile echo "FT_LIBTOOL_DIR := \$(OBJ_DIR)" >> Makefile echo "ifndef FT2DEMOS" >> Makefile echo " include \$(TOP_DIR)/Makefile" >> Makefile diff --git a/docs/README b/docs/README index f82382d45..d71fd379c 100644 --- a/docs/README +++ b/docs/README @@ -1,4 +1,4 @@ -After saying `make refdoc' or `make refdoc-venv' the `site/' directory +After saying `make refdoc' or `make refdoc-venv' the `reference/' directory contains the FreeType API reference. You need Python >= 3.5 and pip to make this target. |