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

Trying to output LN only once

Browse Source
This commit is contained in:
Pierre Pronchery 2009-06-16 23:28:10 +00:00
parent 7b5ed85f99
commit 97f5e1d04c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/makefile.c
View File

@ -237,6 +237,7 @@ static int _variables_executables(Configure * configure, FILE * fp)
{ {
String const * targets; String const * targets;
String const * includes; String const * includes;
String const * package;
String * p; String * p;
String * q; String * q;
size_t i; size_t i;
@ -246,6 +247,7 @@ static int _variables_executables(Configure * configure, FILE * fp)
return 0; return 0;
targets = config_get(configure->config, "", "targets"); targets = config_get(configure->config, "", "targets");
includes = config_get(configure->config, "", "includes"); includes = config_get(configure->config, "", "includes");
package = config_get(configure->config, "", "package");
if(targets != NULL) if(targets != NULL)
{ {
if((p = string_new(targets)) == NULL) if((p = string_new(targets)) == NULL)
@ -270,19 +272,16 @@ static int _variables_executables(Configure * configure, FILE * fp)
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);
} }
if(targets != NULL || includes != NULL) if(targets != NULL || includes != NULL || package != NULL)
fputs("RM\t= rm -f\n", fp); fputs("RM\t= rm -f\nLN\t= ln -f\n", fp);
if(config_get(configure->config, "", "package")) if(package != NULL)
{ {
if(targets == NULL && includes == NULL) fprintf(fp, "%s", "TAR\t= tar -czvf\n");
fputs("RM\t= rm -f\n", fp);
fprintf(fp, "%s", "LN\t= ln -f\nTAR\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);
fputs("INSTALL\t= install\n", fp); fputs("INSTALL\t= install\n", fp);
fputs("LN\t= ln -f\n", fp);
} }
return 0; return 0;
} }
@ -526,7 +525,7 @@ static void _variables_libtool(Configure * configure, FILE * fp, char * done)
{ {
_variables_library(configure, fp, done); _variables_library(configure, fp, done);
if(!done[TT_LIBTOOL]) if(!done[TT_LIBTOOL])
fputs("LN\t= ln -f\nLIBTOOL\t= libtool\n", fp); fputs("LIBTOOL\t= libtool\n", fp);
} }
static int _variables_includes(Configure * configure, FILE * fp) static int _variables_includes(Configure * configure, FILE * fp)