[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'.
GSoC-2020-greg
Nikhil Ramakrishnan 5 years ago
parent 1fd3148713
commit 13c0df80dc
  1. 13
      ChangeLog
  2. 1
      builds/unix/unix-def.in
  3. 8
      configure
  4. 2
      docs/README

@ -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.

@ -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'

8
configure vendored

@ -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

@ -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.

Loading…
Cancel
Save