Revert "Simplify target generation by assuming file is always a subpa…

…th of src_prefix" This reverts commit e135737.
Largo · Jun 7, 2024 · 094b6ac · 094b6ac
1 parent e135737
commit 094b6ac
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/bin/ocran b/bin/ocran
@@ -679,7 +679,14 @@ EOF
       Ocran.msg "Adding user-supplied source files"
       Ocran.files.each do |file|
         file = src_prefix / file
-        target = SRCDIR / file.relative_path_from(src_prefix)
+        if file.subpath?(exec_prefix)
+          target = file.relative_path_from(exec_prefix)
+        elsif file.subpath?(src_prefix)
+          target = SRCDIR / file.relative_path_from(src_prefix)
+        else
+          target = SRCDIR / file.basename
+        end
+
         target_script ||= target
 
         if file.directory?