shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

Minor fix for `make devel'.

* builds/freetype.mk (INCLUDE_FLAGS) [DEVEL_DIR]: Don't use
pkg-config for bzip2 since not all GNU/Linux distributions have
`bzip2.pc' (and the header file `bzlib.h' is located in /usr/include
normally).

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,12 @@

+2014-03-04  Werner Lemberg  <[email protected]>

+

+	Minor fix for `make devel'.

+

+	* builds/freetype.mk (INCLUDE_FLAGS) [DEVEL_DIR]: Don't use

+	pkg-config for bzip2 since not all GNU/Linux distributions have

+	`bzip2.pc' (and the header file `bzlib.h' is located in /usr/include

+	normally).

+

 2014-03-04  Sean McBride  <[email protected]>

 	Fix several clang static analyzer dead store warnings.

--- a/builds/freetype.mk

+++ b/builds/freetype.mk

@@ -3,7 +3,7 @@

 #

-# Copyright 1996-2006, 2008, 2013 by

+# Copyright 1996-2006, 2008, 2013, 2014 by

 # David Turner, Robert Wilhelm, and Werner Lemberg.

 #

 # This file is part of the FreeType project, and may only be used, modified,

@@ -130,8 +130,7 @@

   # We assume that all library dependencies for FreeType are fulfilled for a

   # development build, so we directly access the necessary include directory

   # information using `pkg-config'.

-  INCLUDE_FLAGS += $(shell pkg-config --cflags bzip2 \

-                                               libpng \

+  INCLUDE_FLAGS += $(shell pkg-config --cflags libpng \

                                                harfbuzz )

 endif