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

Leverage the directory creation routine some more

Browse Source 
This also helps pass the "fixme" test.
This commit is contained in:
Pierre Pronchery 2019-02-21 02:39:05 +01:00
parent 09b64bf730
commit 97f10c9d98
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/makefile.c
View File

@ -2635,6 +2635,7 @@ static int _install_include(Makefile * makefile, String const * include)
char const * install; char const * install;
ssize_t i; ssize_t i;
String * p = NULL; String * p = NULL;
String * directory;
if((install = _makefile_get_config(makefile, include, "install")) if((install = _makefile_get_config(makefile, include, "install"))
== NULL) == NULL)
@ -2644,16 +2645,17 @@ static int _install_include(Makefile * makefile, String const * include)
if((p = string_new_length(include, i)) == NULL) if((p = string_new_length(include, i)) == NULL)
return 2; return 2;
} }
/* FIXME keep track of the directories created */
_makefile_print(makefile, "%s", "\t$(MKDIR) $(DESTDIR)");
_makefile_print_escape(makefile, install);
if(p != NULL) if(p != NULL)
{ {
_makefile_print(makefile, "/"); directory = string_new_append(install, "/", p, NULL);
_makefile_print_escape(makefile, p);
string_delete(p); string_delete(p);
} }
_makefile_print(makefile, "\n"); else
directory = string_new(install);
if(directory == NULL)
return 2;
_makefile_mkdir(makefile, directory);
string_delete(directory);
_makefile_print(makefile, "%s", "\t$(INSTALL) -m 0644 "); _makefile_print(makefile, "%s", "\t$(INSTALL) -m 0644 ");
_makefile_print_escape(makefile, include); _makefile_print_escape(makefile, include);
_makefile_print(makefile, "%s", " $(DESTDIR)"); _makefile_print(makefile, "%s", " $(DESTDIR)");