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

Fix installing includes in sub-folders

Browse Source
This commit is contained in:
Pierre Pronchery 2016-08-13 20:32:02 +02:00
parent f90f6d2c87
commit f4992db978
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/makefile.c
View File

@ -2196,10 +2196,23 @@ static int _install_include(Configure * configure, FILE * fp,
{ {
Config * config = configure->config; Config * config = configure->config;
char const * install; char const * install;
ssize_t i;
String * p = NULL;
if((install = config_get(config, include, "install")) == NULL) if((install = config_get(config, include, "install")) == NULL)
{
install = "$(INCLUDEDIR)"; install = "$(INCLUDEDIR)";
_makefile_print(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", install); if((i = string_rindex(include, "/")) >= 0)
if((p = string_new_length(include, i)) == NULL)
return 2;
}
_makefile_print(fp, "%s%s", "\t$(MKDIR) $(DESTDIR)", install);
if(p != NULL)
{
_makefile_print(fp, "/%s", p);
string_delete(p);
}
_makefile_print(fp, "\n");
_makefile_print(fp, "%s%s%s%s/%s\n", "\t$(INSTALL) -m 0644 ", include, _makefile_print(fp, "%s%s%s%s/%s\n", "\t$(INSTALL) -m 0644 ", include,
" $(DESTDIR)", install, include); " $(DESTDIR)", install, include);
return 0; return 0;