From 08136923f918ed006a1d0ea985ebc3ba83bc774f Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Thu, 1 Sep 2022 04:27:49 -0700 Subject: [PATCH] freetype: Avoid additional level of nesting for header files. NFC --- tools/ports/freetype.py | 4 ++-- tools/ports/harfbuzz.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/ports/freetype.py b/tools/ports/freetype.py index 906dc0dacdb17..f95222289949f 100644 --- a/tools/ports/freetype.py +++ b/tools/ports/freetype.py @@ -101,7 +101,7 @@ def create(final): ports.create_lib(final, o_s) ports.install_header_dir(os.path.join(dest_path, 'include'), - target=os.path.join('freetype2', 'freetype')) + target=os.path.join('freetype2')) return [shared.Cache.get_lib('libfreetype.a', create, what='port')] @@ -111,7 +111,7 @@ def clear(ports, settings, shared): def process_args(ports): - return ['-I' + ports.get_include_dir('freetype2/freetype')] + return ['-I' + ports.get_include_dir('freetype2')] def show(): diff --git a/tools/ports/harfbuzz.py b/tools/ports/harfbuzz.py index 5636dd7a12d9c..1c42d91905457 100644 --- a/tools/ports/harfbuzz.py +++ b/tools/ports/harfbuzz.py @@ -90,7 +90,7 @@ def create(final): build_path = ports.clear_project_build('harfbuzz') source_path = os.path.join(ports.get_dir(), 'harfbuzz', 'harfbuzz-' + VERSION) - freetype_include = ports.get_include_dir('freetype2/freetype') + freetype_include = ports.get_include_dir('freetype2') ports.install_headers(os.path.join(source_path, 'src'), target='harfbuzz') # TODO(sbc): Look into HB_TINY, HB_LEAN, HB_MINI options. Remove