forked from rpms/freetype
1afc4d227d
Backport changes from freetype-2.5.0.1 (ft2demos-2.5.0.1 and freetype-doc-2.5.0.1 were not released)
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
--- a/builds/unix/install.mk
|
|
+++ b/builds/unix/install.mk
|
|
@@ -3,7 +3,7 @@
|
|
#
|
|
|
|
|
|
-# Copyright 1996-2000, 2002, 2003, 2006 by
|
|
+# Copyright 1996-2000, 2002, 2003, 2006, 2013 by
|
|
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
|
#
|
|
# This file is part of the FreeType project, and may only be used, modified,
|
|
@@ -31,7 +31,6 @@ install: $(PROJECT_LIBRARY)
|
|
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
|
$(DESTDIR)$(libdir)/pkgconfig \
|
|
$(DESTDIR)$(includedir)/freetype2/freetype/config \
|
|
- $(DESTDIR)$(includedir)/freetype2/freetype/cache \
|
|
$(DESTDIR)$(bindir) \
|
|
$(DESTDIR)$(datadir)/aclocal
|
|
$(LIBTOOL) --mode=install $(INSTALL) \
|
|
--- a/devel/ftoption.h
|
|
+++ b/devel/ftoption.h
|
|
@@ -765,7 +765,7 @@ FT_BEGIN_HEADER
|
|
/* switch between the two engines using the `hinting-engine' property of */
|
|
/* the cff driver module. */
|
|
/* */
|
|
-/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
|
|
+#define CFF_CONFIG_OPTION_OLD_ENGINE
|
|
|
|
|
|
/*************************************************************************/
|
|
--- a/include/freetype/config/ftoption.h
|
|
+++ b/include/freetype/config/ftoption.h
|
|
@@ -765,7 +765,7 @@ FT_BEGIN_HEADER
|
|
/* switch between the two engines using the `hinting-engine' property of */
|
|
/* the cff driver module. */
|
|
/* */
|
|
-#define CFF_CONFIG_OPTION_OLD_ENGINE
|
|
+/* #define CFF_CONFIG_OPTION_OLD_ENGINE */
|
|
|
|
|
|
/*************************************************************************/
|