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

PREFIX and DESTDIR were not present in directories with only includes

Browse Source
This commit is contained in:
Pierre Pronchery 2007-10-09 15:52:51 +00:00
parent a70745de40
commit d70a24d32a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/makefile.c
View File

@ -246,6 +246,11 @@ static int _variables_executables(Configure * configure, FILE * fp)
i = 0; i = 0;
} }
} }
else if(includes != NULL)
{
fprintf(fp, "%s%s\n", "PREFIX\t= ", configure->prefs->prefix);
fprintf(fp, "%s%s\n", "DESTDIR\t= ", configure->prefs->destdir);
}
if(targets != NULL || includes != NULL) if(targets != NULL || includes != NULL)
fprintf(fp, "%s", "RM\t= rm -f\n"); fprintf(fp, "%s", "RM\t= rm -f\n");
if(config_get(configure->config, "", "package")) if(config_get(configure->config, "", "package"))
@ -447,9 +452,10 @@ static void _binary_ldflags(Configure * configure, FILE * fp,
static void _variables_library(Configure * configure, FILE * fp, char * done) static void _variables_library(Configure * configure, FILE * fp, char * done)
{ {
if(!done[TT_LIBRARY]) if(!done[TT_LIBRARY])
fprintf(fp, "%s%s%s%s\n", "PREFIX\t= ", {
configure->prefs->prefix, "\nDESTDIR\t= ", fprintf(fp, "%s%s\n", "PREFIX\t= ", configure->prefs->prefix);
configure->prefs->destdir); fprintf(fp, "%s%s\n", "DESTDIR\t= ", configure->prefs->destdir);
}
if(configure->prefs->libdir[0] == '/') if(configure->prefs->libdir[0] == '/')
fprintf(fp, "%s%s\n", "LIBDIR\t= ", configure->prefs->libdir); fprintf(fp, "%s%s\n", "LIBDIR\t= ", configure->prefs->libdir);
else else