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

Allow redistributable files to be installed with specific permissions

Browse Source
This commit is contained in:
Pierre Pronchery 2009-12-29 18:05:07 +00:00
parent c9e7cf342b
commit c4b1894412
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/makefile.c
View File

@ -945,7 +945,7 @@ static int _target_library(Configure * configure, FILE * fp,
fputc('\n', fp); fputc('\n', fp);
fprintf(fp, "%s%s%s%s%s", "\t$(AR) ", target, ".a $(", target, fprintf(fp, "%s%s%s%s%s", "\t$(AR) ", target, ".a $(", target,
"_OBJS)"); "_OBJS)");
if((q = malloc(strlen(target) + 4)) != NULL) if((q = malloc(strlen(target) + 4)) != NULL) /* for ".so" later */
{ {
sprintf(q, "%s.a", target); sprintf(q, "%s.a", target);
if((p = config_get(configure->config, q, "ldflags")) != NULL) if((p = config_get(configure->config, q, "ldflags")) != NULL)
@ -1720,6 +1720,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;
if((p = config_get(configure->config, "", "dist")) == NULL) if((p = config_get(configure->config, "", "dist")) == NULL)
return 0; return 0;
@ -1732,11 +1733,13 @@ 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)
m = "0644";
if((d = config_get(configure->config, dist, "install")) != NULL) if((d = config_get(configure->config, dist, "install")) != NULL)
{ {
fprintf(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", d); fprintf(fp, "%s%s\n", "\t$(MKDIR) $(DESTDIR)", d);
fprintf(fp, "%s%s%s%s/%s\n", "\t$(INSTALL) -m 0644 ", fprintf(fp, "%s%s%s%s%s%s/%s\n", "\t$(INSTALL) -m ",
dist, " $(DESTDIR)", d, dist); m, " ", dist, " $(DESTDIR)", d, dist);
} }
if(c == '\0') if(c == '\0')
break; break;