also order libobsd_license before libobsd_dep outside Windows

guijan · Jan 5, 2025 · 3eced82 · 3eced82
1 parent 8df2f3b
commit 3eced82
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/meson.build b/meson.build
@@ -132,25 +132,28 @@ if not subproj
 endif
 
 libobsd_license = 'LICENSE.txt'
+libobsd_license_subproj = 'LICENSE_libobsd.txt'
 libobsd_readme = 'README.md'
 docdir = get_option('docdir')
 if docdir == ''
-  docdir = get_option('datadir') / 'doc' \
-           / meson.project_name() + '-' + meson.project_version()
+  docdir = get_option('datadir') / 'doc'
 endif
+docdir = docdir / meson.project_name() + '-' + meson.project_version()
 before_libobsd_dep = []
 if windows_host
   unix2dos = find_program('unix2dos')
-  outname = subproj ? 'LICENSE_libobsd.txt' : libobsd_license
-  before_libobsd_dep += custom_target('license',
-                                      command: [unix2dos],
-                                      input: libobsd_license,
-                                      feed: true,
-                                      capture: true,
-                                      output: outname,
-                                      build_by_default: true,
-                                      install: not subproj,
-                                      install_dir: docdir)
+  outname = subproj ? libobsd_license_subproj : libobsd_license
+  libobsd_license_tgt += custom_target('license',
+                                       command: [unix2dos],
+                                       input: libobsd_license,
+                                       feed: true,
+                                       capture: true,
+                                       output: outname,
+                                       build_by_default: true,
+                                       install: not subproj,
+                                       install_dir: docdir)
+  libobsd_license = libobsd_license_tgt.full_path()
+  before_libobsd_dep += libobsd_license_tgt
   custom_target('readme',
                 command: [unix2dos],
                 input: libobsd_readme,
@@ -160,7 +163,13 @@ if windows_host
                 build_by_default: true,
                 install: not subproj,
                 install_dir: docdir)
-elif not subproj
+elif subproj
+  fs = import('fs')
+  before_libobsd_dep_tgt = fs.copyfile(libobsd_license, libobsd_license_subproj)
+  before_libobsd_dep += libobsd_license_tgt
+endif
+
+if not subproj
     install_data(libobsd_license, libobsd_readme,
                  install_dir: docdir,
                  install_tag: 'doc')