Merge pull request #3472 from dscho/expand-runtime-prefix

Re-do the path interpolation support regarding RUNTIME_PREFIX
git-for-windows · Jan 20, 2022 · 0f9a1f7 · 0f9a1f7
2 parents 415db8d + 4905f16
commit 0f9a1f7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/path.c b/path.c
@@ -739,6 +739,12 @@ char *interpolate_path(const char *path, int real_home)
 	if (skip_prefix(path, "%(prefix)/", &path))
 		return system_path(path);
 
+#ifdef __MINGW32__
+	if (path[0] == '/') {
+		warning(_("encountered old-style '%s' that should be '%%(prefix)%s'"), path, path);
+		return system_path(path + 1);
+	}
+#endif
 	if (path[0] == '~') {
 		const char *first_slash = strchrnul(path, '/');
 		const char *username = path + 1;