freetype: Avoid additional level of nesting for header files. NFC (#1…

…7778)
emscripten-core · Sep 2, 2022 · 44fd8b1 · 44fd8b1
1 parent e46659c
commit 44fd8b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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