DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for spaces in filenames (9/x)

Browse Source 
This adds a new option for scripts, "flags", which should be used for
command-line arguments when calling scripts.

GNU Make is required for this to work.
This commit is contained in:
Pierre Pronchery 2019-02-20 18:12:03 +01:00
parent 819ec869f5
commit 67764a83e5
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/makefile.c
View File

@ -1638,6 +1638,7 @@ static int _target_script(Makefile * makefile,
{ {
String const * prefix; String const * prefix;
String const * script; String const * script;
String const * flags;
int phony; int phony;
if((script = _makefile_get_config(makefile, target, "script")) == NULL) if((script = _makefile_get_config(makefile, target, "script")) == NULL)
@ -1646,6 +1647,7 @@ static int _target_script(Makefile * makefile,
": No script for target\n"); ": No script for target\n");
return 1; return 1;
} }
flags = _makefile_get_config(makefile, target, "flags");
if(makefile->fp == NULL) if(makefile->fp == NULL)
_script_check(makefile, target, script); _script_check(makefile, target, script);
if(_makefile_is_flag_set(makefile, PREFS_S)) if(_makefile_is_flag_set(makefile, PREFS_S))
@ -1659,8 +1661,11 @@ static int _target_script(Makefile * makefile,
prefix = "$(PREFIX)"; prefix = "$(PREFIX)";
_makefile_print(makefile, "\n\t"); _makefile_print(makefile, "\n\t");
_makefile_print_escape(makefile, script); _makefile_print_escape(makefile, script);
_makefile_print(makefile, " -P \"%s\" -- \"%s%s\"\n", prefix, _makefile_print(makefile, " -P \"%s\"", prefix);
phony ? "" : "$(OBJDIR)", target); if(flags != NULL && flags[0] != '\0')
_makefile_print(makefile, " %s", flags);
_makefile_print(makefile, " -- \"%s%s\"\n", phony ? "" : "$(OBJDIR)",
target);
return 0; return 0;
} }
@ -2083,6 +2088,7 @@ static int _write_clean(Makefile * makefile)
static int _clean_targets(Makefile * makefile) static int _clean_targets(Makefile * makefile)
{ {
String const * prefix; String const * prefix;
String const * flags;
String const * p; String const * p;
String * targets; String * targets;
String * q; String * q;
@ -2137,13 +2143,18 @@ static int _clean_targets(Makefile * makefile)
if((prefix = _makefile_get_config(makefile, targets, if((prefix = _makefile_get_config(makefile, targets,
"prefix")) == NULL) "prefix")) == NULL)
prefix = "$(PREFIX)"; prefix = "$(PREFIX)";
flags = _makefile_get_config(makefile, targets,
"flags");
phony = _makefile_is_phony(makefile, targets); phony = _makefile_is_phony(makefile, targets);
_makefile_print(makefile, "\t"); _makefile_print(makefile, "\t");
_makefile_print_escape(makefile, p); _makefile_print_escape(makefile, p);
_makefile_print(makefile, "%s%s%s%s%s%s\n", " -c -P \"", _makefile_print(makefile, "%s%s%s", " -c -P \"", prefix,
prefix, "\" -- \"",
phony ? "" : "$(OBJDIR)", targets,
"\""); "\"");
if(flags != NULL && flags[0] != '\0')
_makefile_print(makefile, " %s", flags);
_makefile_print(makefile, "%s%s%s%s", " -- \"",
phony ? "" : "$(OBJDIR)",
targets, "\"\n");
} }
if(c == '\0') if(c == '\0')
break; break;
@ -2569,19 +2580,23 @@ static void _install_target_script(Makefile * makefile, String const * target)
{ {
String const * path; String const * path;
String const * script; String const * script;
String const * flags;
int phony; int phony;
if((path = _makefile_get_config(makefile, target, "install")) == NULL) if((path = _makefile_get_config(makefile, target, "install")) == NULL)
return; return;
if((script = _makefile_get_config(makefile, target, "script")) == NULL) if((script = _makefile_get_config(makefile, target, "script")) == NULL)
return; return;
flags = _makefile_get_config(makefile, target, "flags");
phony = _makefile_is_phony(makefile, target); phony = _makefile_is_phony(makefile, target);
_makefile_print(makefile, "\t"); _makefile_print(makefile, "\t");
_makefile_print_escape(makefile, script); _makefile_print_escape(makefile, script);
_makefile_print(makefile, "%s%s%s%s%s%s", " -P \"$(DESTDIR)", _makefile_print(makefile, "%s%s%s", " -P \"$(DESTDIR)",
(path[0] != '\0') ? path : "$(PREFIX)", (path[0] != '\0') ? path : "$(PREFIX)", "\" -i");
"\" -i -- \"", phony ? "" : "$(OBJDIR)", target, if(flags != NULL && flags[0] != '\0')
"\"\n"); _makefile_print(makefile, " %s", flags);
_makefile_print(makefile, "%s%s%s%s", " -- \"",
phony ? "" : "$(OBJDIR)", target, "\"\n");
} }
static int _install_include(Makefile * makefile, String const * include); static int _install_include(Makefile * makefile, String const * include);
@ -2997,14 +3012,18 @@ static void _uninstall_target_script(Makefile * makefile,
String const * target, String const * path) String const * target, String const * path)
{ {
String const * script; String const * script;
String const * flags;
if((script = _makefile_get_config(makefile, target, "script")) == NULL) if((script = _makefile_get_config(makefile, target, "script")) == NULL)
return; return;
flags = _makefile_get_config(makefile, target, "flags");
_makefile_print(makefile, "\t"); _makefile_print(makefile, "\t");
_makefile_print_escape(makefile, script); _makefile_print_escape(makefile, script);
_makefile_print(makefile, "%s%s%s%s%s", " -P \"$(DESTDIR)", _makefile_print(makefile, "%s%s%s", " -P \"$(DESTDIR)",
(path[0] != '\0') ? path : "$(PREFIX)", "\" -u -- \"", (path[0] != '\0') ? path : "$(PREFIX)", "\" -u");
target, "\"\n"); if(flags != NULL && flags[0] != '\0')
_makefile_print(makefile, " %s", flags);
_makefile_print(makefile, "%s%s%s", " -- \"", target, "\"\n");
} }
static int _uninstall_include(Makefile * makefile, static int _uninstall_include(Makefile * makefile,