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

Pave the way to keep track of directories created

Browse Source
This commit is contained in:
Pierre Pronchery 2016-09-12 04:39:08 +02:00
parent dda49d988c
commit 54aa67d2bd
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/makefile.c
View File

@ -55,6 +55,7 @@ static int _makefile_link(FILE * fp, int symlink, char const * link,
char const * path); char const * path);
static int _makefile_output_variable(FILE * fp, char const * name, static int _makefile_output_variable(FILE * fp, char const * name,
char const * value); char const * value);
static int _makefile_mkdir(FILE * fp, char const * directory);
static int _makefile_print(FILE * fp, char const * format, ...); static int _makefile_print(FILE * fp, char const * format, ...);
static int _makefile_remove(FILE * fp, int recursive, ...); static int _makefile_remove(FILE * fp, int recursive, ...);
static int _makefile_subdirs(FILE * fp, char const * target); static int _makefile_subdirs(FILE * fp, char const * target);
@ -2093,7 +2094,7 @@ static void _install_target_binary(Configure * configure, FILE * fp,
if((path = config_get(configure->config, target, "install")) == NULL) if((path = config_get(configure->config, target, "install")) == NULL)
return; return;
_makefile_print(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", path); _makefile_mkdir(fp, path);
_makefile_print(fp, "%s%s%s%s/%s%s\n", _makefile_print(fp, "%s%s%s%s/%s%s\n",
"\t$(INSTALL) -m 0755 $(OBJDIR)", target, "\t$(INSTALL) -m 0755 $(OBJDIR)", target,
"$(EXEEXT) $(DESTDIR)", path, target, "$(EXEEXT)"); "$(EXEEXT) $(DESTDIR)", path, target, "$(EXEEXT)");
@ -2108,7 +2109,7 @@ static int _install_target_library(Configure * configure, FILE * fp,
if((path = config_get(configure->config, target, "install")) == NULL) if((path = config_get(configure->config, target, "install")) == NULL)
return 0; return 0;
_makefile_print(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", path); _makefile_mkdir(fp, path);
if(configure_can_library_static(configure)) if(configure_can_library_static(configure))
/* install the static library */ /* install the static library */
_makefile_print(fp, "%s%s%s%s/%s%s", _makefile_print(fp, "%s%s%s%s/%s%s",
@ -2159,7 +2160,7 @@ static void _install_target_libtool(Configure * configure, FILE * fp,
if((path = config_get(configure->config, target, "install")) == NULL) if((path = config_get(configure->config, target, "install")) == NULL)
return; return;
_makefile_print(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", path); _makefile_mkdir(fp, path);
_makefile_print(fp, "%s%s%s%s/%s%s", _makefile_print(fp, "%s%s%s%s/%s%s",
"\t$(LIBTOOL) --mode=install $(INSTALL)" "\t$(LIBTOOL) --mode=install $(INSTALL)"
" -m 0755 $(OBJDIR)", target, ".la $(DESTDIR)", path, " -m 0755 $(OBJDIR)", target, ".la $(DESTDIR)", path,
@ -2175,7 +2176,7 @@ static void _install_target_object(Configure * configure, FILE * fp,
if((path = config_get(configure->config, target, "install")) == NULL) if((path = config_get(configure->config, target, "install")) == NULL)
return; return;
_makefile_print(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", path); _makefile_mkdir(fp, path);
_makefile_print(fp, "%s%s%s%s/%s\n", "\t$(INSTALL) -m 0644 $(OBJDIR)", _makefile_print(fp, "%s%s%s%s/%s\n", "\t$(INSTALL) -m 0644 $(OBJDIR)",
target, " $(DESTDIR)", path, target); target, " $(DESTDIR)", path, target);
} }
@ -2196,7 +2197,7 @@ static void _install_target_plugin(Configure * configure, FILE * fp,
|| (m = strtol(mode, &p, 8)) == 0 || (m = strtol(mode, &p, 8)) == 0
|| *p != '\0') || *p != '\0')
mode = "0755"; mode = "0755";
_makefile_print(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", path); _makefile_mkdir(fp, path);
_makefile_print(fp, "%s%04o%s%s%s%s%s%s%s", "\t$(INSTALL) -m ", m, _makefile_print(fp, "%s%04o%s%s%s%s%s%s%s", "\t$(INSTALL) -m ", m,
" $(OBJDIR)", target, "$(SOEXT) $(DESTDIR)", path, "/", " $(OBJDIR)", target, "$(SOEXT) $(DESTDIR)", path, "/",
target, "$(SOEXT)\n"); target, "$(SOEXT)\n");
@ -2267,6 +2268,7 @@ static int _install_include(Configure * configure, FILE * fp,
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(fp, "%s%s", "\t$(MKDIR) $(DESTDIR)", install); _makefile_print(fp, "%s%s", "\t$(MKDIR) $(DESTDIR)", install);
if(p != NULL) if(p != NULL)
{ {
@ -2361,13 +2363,13 @@ static int _dist_install(Configure * configure, FILE * fp,
if((p = string_new(filename)) == NULL) if((p = string_new(filename)) == NULL)
return -1; return -1;
q = dirname(p); q = dirname(p);
/* FIXME keep track of the directories created */
_makefile_print(fp, "%s%s%c%s\n", "\t$(MKDIR) $(DESTDIR)", _makefile_print(fp, "%s%s%c%s\n", "\t$(MKDIR) $(DESTDIR)",
directory, sep, q); directory, sep, q);
string_delete(p); string_delete(p);
} }
else else
_makefile_print(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", _makefile_mkdir(fp, directory);
directory);
_makefile_print(fp, "%s%s%s%s%s%s%c%s\n", "\t$(INSTALL) -m ", mode, " ", _makefile_print(fp, "%s%s%s%s%s%s%c%s\n", "\t$(INSTALL) -m ", mode, " ",
filename, " $(DESTDIR)", directory, sep, filename); filename, " $(DESTDIR)", directory, sep, filename);
return 0; return 0;
@ -2700,6 +2702,15 @@ static int _makefile_output_variable(FILE * fp, char const * name,
} }
/* makefile_mkdir */
static int _makefile_mkdir(FILE * fp, char const * directory)
{
/* FIXME keep track of the directories created */
return _makefile_print(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)",
directory);
}
/* makefile_print */ /* makefile_print */
static int _makefile_print(FILE * fp, char const * format, ...) static int _makefile_print(FILE * fp, char const * format, ...)
{ {