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

Fixed default prefix while installing scripts

Browse Source
This commit is contained in:
Pierre Pronchery 2010-04-22 11:29:50 +00:00
parent 64003af5a0
commit df2787d976
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/makefile.c
View File

@ -206,12 +206,13 @@ static int _variables_dist(Configure * configure, FILE * fp)
dist[i] = '\0'; dist[i] = '\0';
if(config_get(configure->config, dist, "install") != NULL) if(config_get(configure->config, dist, "install") != NULL)
{ {
/* FIXME may also be output when parsing targets */ /* FIXME may still need to be output */
fprintf(fp, "%s%s\n%s%s\n%s%s%s", "PREFIX\t= ", if(config_get(configure->config, "", "targets") == NULL)
configure->prefs->prefix, fprintf(fp, "%s%s\n%s%s\n", "PREFIX\t= ",
"DESTDIR\t= ", configure->prefs->prefix,
configure->prefs->destdir, "DESTDIR\t= ",
"MKDIR\t= mkdir -p\n", configure->prefs->destdir);
fprintf(fp, "%s%s%s", "MKDIR\t= mkdir -p\n",
"INSTALL\t= install\n", "INSTALL\t= install\n",
"RM\t= rm -f\n"); "RM\t= rm -f\n");
break; break;
@ -325,9 +326,7 @@ static int _variables_executables(Configure * configure, FILE * fp)
if(targets != NULL || includes != NULL || package != NULL) if(targets != NULL || includes != NULL || package != NULL)
fputs("RM\t= rm -f\nLN\t= ln -f\n", fp); fputs("RM\t= rm -f\nLN\t= ln -f\n", fp);
if(package != NULL) if(package != NULL)
{
fprintf(fp, "%s", "TAR\t= tar -czvf\n"); fprintf(fp, "%s", "TAR\t= tar -czvf\n");
}
if(targets != NULL || includes != NULL) if(targets != NULL || includes != NULL)
{ {
fputs("MKDIR\t= mkdir -p\n", fp); fputs("MKDIR\t= mkdir -p\n", fp);
@ -339,6 +338,7 @@ static int _variables_executables(Configure * configure, FILE * fp)
static void _variables_binary(Configure * configure, FILE * fp, char * done); static void _variables_binary(Configure * configure, FILE * fp, char * done);
static void _variables_library(Configure * configure, FILE * fp, char * done); static void _variables_library(Configure * configure, FILE * fp, char * done);
static void _variables_libtool(Configure * configure, FILE * fp, char * done); static void _variables_libtool(Configure * configure, FILE * fp, char * done);
static void _variables_script(Configure * configure, FILE * fp, char * done);
static void _executables_variables(Configure * configure, FILE * fp, static void _executables_variables(Configure * configure, FILE * fp,
String const * target) String const * target)
{ {
@ -368,8 +368,10 @@ static void _executables_variables(Configure * configure, FILE * fp,
case TT_LIBTOOL: case TT_LIBTOOL:
_variables_libtool(configure, fp, done); _variables_libtool(configure, fp, done);
break; break;
case TT_OBJECT:
case TT_SCRIPT: case TT_SCRIPT:
_variables_script(configure, fp, done);
break;
case TT_OBJECT:
case TT_UNKNOWN: case TT_UNKNOWN:
break; break;
} }
@ -384,7 +386,7 @@ static void _binary_ldflags(Configure * configure, FILE * fp,
String const * ldflags); String const * ldflags);
static void _variables_binary(Configure * configure, FILE * fp, char * done) static void _variables_binary(Configure * configure, FILE * fp, char * done)
{ {
if(!done[TT_LIBRARY]) if(!done[TT_LIBRARY] && !done[TT_SCRIPT])
{ {
fprintf(fp, "%s%s\n", "PREFIX\t= ", configure->prefs->prefix); fprintf(fp, "%s%s\n", "PREFIX\t= ", configure->prefs->prefix);
fprintf(fp, "%s%s\n", "DESTDIR\t= ", configure->prefs->destdir); fprintf(fp, "%s%s\n", "DESTDIR\t= ", configure->prefs->destdir);
@ -555,7 +557,7 @@ static void _variables_library(Configure * configure, FILE * fp, char * done)
String const * libdir; String const * libdir;
String const * p; String const * p;
if(!done[TT_LIBRARY]) if(!done[TT_LIBRARY] && !done[TT_SCRIPT])
{ {
fprintf(fp, "%s%s\n", "PREFIX\t= ", configure->prefs->prefix); fprintf(fp, "%s%s\n", "PREFIX\t= ", configure->prefs->prefix);
fprintf(fp, "%s%s\n", "DESTDIR\t= ", configure->prefs->destdir); fprintf(fp, "%s%s\n", "DESTDIR\t= ", configure->prefs->destdir);
@ -591,6 +593,15 @@ static void _variables_libtool(Configure * configure, FILE * fp, char * done)
fputs("LIBTOOL\t= libtool\n", fp); fputs("LIBTOOL\t= libtool\n", fp);
} }
static void _variables_script(Configure * configure, FILE * fp, char * done)
{
if(!done[TT_BINARY] && !done[TT_LIBRARY] && !done[TT_SCRIPT])
{
fprintf(fp, "%s%s\n", "PREFIX\t= ", configure->prefs->prefix);
fprintf(fp, "%s%s\n", "DESTDIR\t= ", configure->prefs->destdir);
}
}
static int _variables_includes(Configure * configure, FILE * fp) static int _variables_includes(Configure * configure, FILE * fp)
{ {
String const * includes; String const * includes;