diff --git a/src/check-c-linkage-decls.py b/src/check-c-linkage-decls.py index 41b9d02a5..6ae2579f7 100755 --- a/src/check-c-linkage-decls.py +++ b/src/check-c-linkage-decls.py @@ -4,9 +4,9 @@ import sys, os os.chdir (os.environ.get ('srcdir', os.path.dirname (__file__))) -HBHEADERS = os.environ.get ('HBHEADERS', '').split () or \ +HBHEADERS = [os.path.basename (x) for x in os.environ.get ('HBHEADERS', '').split ()] or \ [x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')] -HBSOURCES = os.environ.get ('HBSOURCES', '').split () or \ +HBSOURCES = [os.path.basename (x) for x in os.environ.get ('HBSOURCES', '').split ()] or \ [x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith (('.cc', '.hh'))] stat = 0 diff --git a/src/check-externs.py b/src/check-externs.py index 13aedf85a..ea6d7f3ad 100755 --- a/src/check-externs.py +++ b/src/check-externs.py @@ -4,7 +4,7 @@ import sys, os, re os.chdir (os.environ.get ('srcdir', os.path.dirname (__file__))) -HBHEADERS = os.environ.get ('HBHEADERS', '').split () or \ +HBHEADERS = [os.path.basename (x) for x in os.environ.get ('HBHEADERS', '').split ()] or \ [x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')] stat = 0 diff --git a/src/check-header-guards.py b/src/check-header-guards.py index e6c907731..6bf6ad42f 100755 --- a/src/check-header-guards.py +++ b/src/check-header-guards.py @@ -4,9 +4,9 @@ import sys, os, re os.chdir (os.environ.get ('srcdir', os.path.dirname (__file__))) -HBHEADERS = os.environ.get ('HBHEADERS', '').split () or \ +HBHEADERS = [os.path.basename (x) for x in os.environ.get ('HBHEADERS', '').split ()] or \ [x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')] -HBSOURCES = os.environ.get ('HBSOURCES', '').split () or \ +HBSOURCES = [os.path.basename (x) for x in os.environ.get ('HBSOURCES', '').split ()] or \ [x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith (('.cc', '.hh'))] stat = 0 diff --git a/src/check-includes.py b/src/check-includes.py index b278b3e59..d9219bf8b 100755 --- a/src/check-includes.py +++ b/src/check-includes.py @@ -4,9 +4,9 @@ import sys, os, re os.chdir (os.environ.get ('srcdir', os.path.dirname (__file__))) -HBHEADERS = os.environ.get ('HBHEADERS', '').split () or \ +HBHEADERS = [os.path.basename (x) for x in os.environ.get ('HBHEADERS', '').split ()] or \ [x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith ('.h')] -HBSOURCES = os.environ.get ('HBSOURCES', '').split () or \ +HBSOURCES = [os.path.basename (x) for x in os.environ.get ('HBSOURCES', '').split ()] or \ [x for x in os.listdir ('.') if x.startswith ('hb') and x.endswith (('.cc', '.hh'))] stat = 0 diff --git a/src/meson.build b/src/meson.build index 57278c522..0de85a7e9 100644 --- a/src/meson.build +++ b/src/meson.build @@ -676,12 +676,12 @@ if get_option('tests').enabled() env.set('libs', meson.current_build_dir()) # TODO: Merge this with builddir after autotools removal HBSOURCES = [] foreach f : hb_sources - HBSOURCES += '@0@'.format(f).split ('/')[1] + HBSOURCES += '@0@'.format(f) endforeach env.set('HBSOURCES', ' '.join(HBSOURCES)) HBHEADERS = [] foreach f : hb_headers - HBHEADERS += '@0@'.format(f).split ('/')[1] + HBHEADERS += '@0@'.format(f) endforeach env.set('HBHEADERS', ' '.join(HBHEADERS))