No longer automatically add $(PREFIX) when (un)installing script targets

This commit is contained in:
Pierre Pronchery 2014-10-17 20:42:17 +02:00
parent 2f213e60e2
commit f019e6315d

View File

@ -1941,8 +1941,8 @@ static void _install_target_script(Configure * configure, FILE * fp,
return; return;
if((script = config_get(configure->config, target, "script")) == NULL) if((script = config_get(configure->config, target, "script")) == NULL)
return; return;
fprintf(fp, "\t%s%s%s%s%s%s%s", script, " -P \"$(DESTDIR)$(PREFIX)", fprintf(fp, "\t%s%s%s%s%s%s", script, " -P \"$(DESTDIR)",
*path ? "/" : "", *path ? path : "", "\" -i -- \"", (path[0] != '\0') ? path : "$(PREFIX)", "\" -i -- \"",
target, "\"\n"); target, "\"\n");
} }
@ -2244,8 +2244,8 @@ static void _uninstall_target_script(Configure * configure, FILE * fp,
if((script = config_get(configure->config, target, "script")) == NULL) if((script = config_get(configure->config, target, "script")) == NULL)
return; return;
fprintf(fp, "\t%s%s%s%s%s%s%s", script, " -P \"$(DESTDIR)$(PREFIX)", fprintf(fp, "\t%s%s%s%s%s%s", script, " -P \"$(DESTDIR)",
*path ? "/" : "", *path ? path : "", "\" -u -- \"", (path[0] != '\0') ? path : "$(PREFIX)", "\" -u -- \"",
target, "\"\n"); target, "\"\n");
} }