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

Better handling of distributable files found in sub-folders (when installing)

Browse Source
This commit is contained in:
Pierre Pronchery 2014-07-17 02:28:41 +02:00
parent 1c84680eb7
commit df286571f4
1 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/makefile.c
View File

@ -21,6 +21,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <libgen.h>
#include "settings.h" #include "settings.h"
#include "configure.h" #include "configure.h"
#include "../config.h" #include "../config.h"
@ -1973,6 +1974,9 @@ static int _install_include(Config * config, FILE * fp, String const * include)
static int _dist_check(Configure * configure, char const * target, static int _dist_check(Configure * configure, char const * target,
char const * mode); char const * mode);
static int _dist_install(Configure * configure, FILE * fp,
char const * directory, char const * mode,
char const * filename);
static int _install_dist(Configure * configure, FILE * fp) static int _install_dist(Configure * configure, FILE * fp)
{ {
int ret = 0; int ret = 0;
@ -1982,7 +1986,7 @@ static int _install_dist(Configure * configure, FILE * fp)
size_t i; size_t i;
char c; char c;
String const * d; String const * d;
String const * m; String const * mode;
if((p = config_get(configure->config, NULL, "dist")) == NULL) if((p = config_get(configure->config, NULL, "dist")) == NULL)
return 0; return 0;
@ -1995,15 +1999,11 @@ static int _install_dist(Configure * configure, FILE * fp)
continue; continue;
c = dist[i]; c = dist[i];
dist[i] = '\0'; dist[i] = '\0';
if((m = config_get(configure->config, dist, "mode")) == NULL) if((mode = config_get(configure->config, dist, "mode")) == NULL)
m = "0644"; mode = "0644";
ret |= _dist_check(configure, dist, m); ret |= _dist_check(configure, dist, mode);
if((d = config_get(configure->config, dist, "install")) != NULL) if((d = config_get(configure->config, dist, "install")) != NULL)
{ _dist_install(configure, fp, d, mode, dist);
fprintf(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", d);
fprintf(fp, "%s%s%s%s%s%s/%s\n", "\t$(INSTALL) -m ", m,
" ", dist, " $(DESTDIR)", d, dist);
}
if(c == '\0') if(c == '\0')
break; break;
dist += i + 1; dist += i + 1;
@ -2041,6 +2041,30 @@ static int _dist_check(Configure * configure, char const * target,
return 0; return 0;
} }
static int _dist_install(Configure * configure, FILE * fp,
char const * directory, char const * mode,
char const * filename)
{
char sep = (configure->os != HO_WIN32) ? '/' : '\\';
String * p;
char const * q;
if(strchr(filename, sep) != NULL)
{
if((p = string_new(filename)) == NULL)
return -1;
q = dirname(p);
fprintf(fp, "%s%s%c%s\n", "\t$(MKDIR) $(DESTDIR)", directory,
sep, q);
string_delete(p);
}
else
fprintf(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", directory);
fprintf(fp, "%s%s%s%s%s%s%c%s\n", "\t$(INSTALL) -m ", mode, " ",
filename, " $(DESTDIR)", directory, sep, filename);
return 0;
}
static int _uninstall_target(Configure * configure, FILE * fp, static int _uninstall_target(Configure * configure, FILE * fp,
String const * target); String const * target);
static int _uninstall_include(Config * config, FILE * fp, static int _uninstall_include(Config * config, FILE * fp,