diff options
| author | Werner Lemberg <wl@gnu.org> | 2017-11-24 10:34:09 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2017-11-25 11:30:38 +0100 |
| commit | 8f4851997b76b5f80095e355cf2444d925cab328 (patch) | |
| tree | 5f66290bb0c089ed6c52cd95fdcf6551b73f7717 /builds/unix/install.mk | |
| parent | 0d0e5bb1e60ef013f40c8964731df6b698aa4fdf (diff) | |
| download | freetype2-8f4851997b76b5f80095e355cf2444d925cab328.tar.gz | |
[unix] Install a massaged `ftoption.h' file (#51780).
* builds/unix/configure.raw (ftoption_set, ftoption_unset): New
auxiliary functions to construct...
(FTOPTION_H_SED): ... this new variable.
Apply it as a sed argument while copying `ftoption.h' to the
`builds/unix' directory (using `AC_CONFIG_FILES').
Simplify code of test that checks cpp's computation of bit length
(the test previously created an empty `ftoption.h' file and deleted
it immediately afterwards); without this change, it can happen on my
GNU/Linux box that `configure's execution of `config.status' doesn't
create `ftoption.h' (no idea why this happens).
* builds/unix/install.mk (install): Install
`builds/unix/ftoption.h'.
* builds/unix/unix-def.in (DISTCLEAN): Updated.
* builds/unix/.gitignore: Updated.
Diffstat (limited to 'builds/unix/install.mk')
| -rw-r--r-- | builds/unix/install.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builds/unix/install.mk b/builds/unix/install.mk index fae486cb3..35d50aac5 100644 --- a/builds/unix/install.mk +++ b/builds/unix/install.mk @@ -30,6 +30,9 @@ # # We also remove `$(includedir)/ft2build.h' for the same reason. # +# Note that some header files get handled twice for simplicity; a special, +# configured version overwrites the generic one. +# install: $(PROJECT_LIBRARY) -$(DELDIR) $(DESTDIR)$(includedir)/freetype2 -$(DELETE) $(DESTDIR)$(includedir)/ft2build.h @@ -55,6 +58,8 @@ install: $(PROJECT_LIBRARY) $(DESTDIR)$(includedir)/freetype2/freetype/config/ftconfig.h $(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \ $(DESTDIR)$(includedir)/freetype2/freetype/config/ftmodule.h + $(INSTALL_DATA) $(OBJ_BUILD)/ftoption.h \ + $(DESTDIR)$(includedir)/freetype2/freetype/config/ftoption.h $(INSTALL_SCRIPT) -m 755 $(OBJ_BUILD)/freetype-config \ $(DESTDIR)$(bindir)/freetype-config $(INSTALL_SCRIPT) -m 644 $(BUILD_DIR)/freetype2.m4 \ |