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

Also output the OBJDIR variable when relevant

Browse Source
This commit is contained in:
Pierre Pronchery 2014-10-31 02:35:26 +01:00
parent c3a612ed97
commit e97db07dd7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/makefile.c
View File

@ -238,6 +238,7 @@ static int _variables_dist(Configure * configure, FILE * fp)
if(config_get(configure->config, NULL, "targets") if(config_get(configure->config, NULL, "targets")
== NULL) == NULL)
{ {
_makefile_output_variable(fp, "OBJDIR", "");
_makefile_output_variable(fp, "PREFIX", _makefile_output_variable(fp, "PREFIX",
configure->prefs->prefix); configure->prefs->prefix);
_makefile_output_variable(fp, "DESTDIR", _makefile_output_variable(fp, "DESTDIR",
@ -384,6 +385,7 @@ static int _variables_executables(Configure * configure, FILE * fp)
} }
else if(includes != NULL) else if(includes != NULL)
{ {
_makefile_output_variable(fp, "OBJDIR", "");
_makefile_output_variable(fp, "PREFIX", _makefile_output_variable(fp, "PREFIX",
configure->prefs->prefix); configure->prefs->prefix);
_makefile_output_variable(fp, "DESTDIR", _makefile_output_variable(fp, "DESTDIR",
@ -464,6 +466,7 @@ static void _variables_binary(Configure * configure, FILE * fp, char * done)
if(!done[TT_LIBRARY] && !done[TT_SCRIPT]) if(!done[TT_LIBRARY] && !done[TT_SCRIPT])
{ {
_makefile_output_variable(fp, "OBJDIR", "");
_makefile_output_variable(fp, "PREFIX", _makefile_output_variable(fp, "PREFIX",
configure->prefs->prefix); configure->prefs->prefix);
_makefile_output_variable(fp, "DESTDIR", _makefile_output_variable(fp, "DESTDIR",
@ -681,6 +684,7 @@ static void _variables_library(Configure * configure, FILE * fp, char * done)
if(!done[TT_LIBRARY] && !done[TT_SCRIPT]) if(!done[TT_LIBRARY] && !done[TT_SCRIPT])
{ {
_makefile_output_variable(fp, "OBJDIR", "");
_makefile_output_variable(fp, "PREFIX", _makefile_output_variable(fp, "PREFIX",
configure->prefs->prefix); configure->prefs->prefix);
_makefile_output_variable(fp, "DESTDIR", _makefile_output_variable(fp, "DESTDIR",
@ -735,6 +739,7 @@ static void _variables_script(Configure * configure, FILE * fp, char * done)
{ {
if(!done[TT_BINARY] && !done[TT_LIBRARY] && !done[TT_SCRIPT]) if(!done[TT_BINARY] && !done[TT_LIBRARY] && !done[TT_SCRIPT])
{ {
_makefile_output_variable(fp, "OBJDIR", "");
_makefile_output_variable(fp, "PREFIX", _makefile_output_variable(fp, "PREFIX",
configure->prefs->prefix); configure->prefs->prefix);
_makefile_output_variable(fp, "DESTDIR", _makefile_output_variable(fp, "DESTDIR",