|
|
@@ -22,21 +22,28 @@ namespace Usm {
|
|
|
public string usm_config_dir { get; set; }
|
|
|
|
|
|
public void set_envs() {
|
|
|
- Environment.set_variable("DESTDIR", destination, true);
|
|
|
- Environment.set_variable("PREFIX", prefix, true);
|
|
|
- Environment.set_variable("BINDIR", bin, true);
|
|
|
- Environment.set_variable("INCLUDEDIR", include, true);
|
|
|
- Environment.set_variable("DATADIR", data, true);
|
|
|
- Environment.set_variable("INFODIR", info, true);
|
|
|
- Environment.set_variable("LIBDIR", lib, true);
|
|
|
- Environment.set_variable("MANDIR", man, true);
|
|
|
- Environment.set_variable("LIBEXECDIR", libexec, true);
|
|
|
- Environment.set_variable("LOCALEDIR", locale, true);
|
|
|
- Environment.set_variable("LOCALSTATEDIR", local_state, true);
|
|
|
- Environment.set_variable("SBINDIR", sbin, true);
|
|
|
- Environment.set_variable("SHAREDSTATEDIR", shared_state, true);
|
|
|
- Environment.set_variable("SYSCONFIGDIR", sys_config, true);
|
|
|
- Environment.set_variable("TAGSDIR", tags, true);
|
|
|
+ Environment.set_variable("DESTDIR", Paths.ensure_trailing_slash(destination), true);
|
|
|
+ Environment.set_variable("PREFIX", Paths.ensure_trailing_slash(prefix), true);
|
|
|
+ Environment.set_variable("BINDIR", Paths.ensure_trailing_slash(bin), true);
|
|
|
+ Environment.set_variable("INCLUDEDIR", Paths.ensure_trailing_slash(include), true);
|
|
|
+ Environment.set_variable("DATADIR", Paths.ensure_trailing_slash(data), true);
|
|
|
+ Environment.set_variable("INFODIR", Paths.ensure_trailing_slash(info), true);
|
|
|
+ Environment.set_variable("LIBDIR", Paths.ensure_trailing_slash(lib), true);
|
|
|
+ Environment.set_variable("MANDIR", Paths.ensure_trailing_slash(man), true);
|
|
|
+ Environment.set_variable("LIBEXECDIR", Paths.ensure_trailing_slash(libexec), true);
|
|
|
+ Environment.set_variable("LOCALEDIR", Paths.ensure_trailing_slash(locale), true);
|
|
|
+ Environment.set_variable("LOCALSTATEDIR", Paths.ensure_trailing_slash(local_state), true);
|
|
|
+ Environment.set_variable("SBINDIR", Paths.ensure_trailing_slash(sbin), true);
|
|
|
+ Environment.set_variable("SHAREDSTATEDIR", Paths.ensure_trailing_slash(shared_state), true);
|
|
|
+ Environment.set_variable("SYSCONFIGDIR", Paths.ensure_trailing_slash(sys_config), true);
|
|
|
+ Environment.set_variable("TAGSDIR", Paths.ensure_trailing_slash(tags), true);
|
|
|
+ }
|
|
|
+
|
|
|
+ public static string ensure_trailing_slash(string path) {
|
|
|
+ if (path == null || path.length == 0) {
|
|
|
+ return "/";
|
|
|
+ }
|
|
|
+ return path.has_suffix("/") ? path : path + "/";
|
|
|
}
|
|
|
|
|
|
public string get_suggested_base_path_for_type(ResourceType type) {
|