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

Also output the value of LIBDIR

Browse Source
This commit is contained in:
Pierre Pronchery 2008-04-30 01:30:58 +00:00
parent 29e18704f9
commit 4f2b31f4a9
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/settings.c
View File

@ -106,8 +106,8 @@ static int _settings_do(Prefs * prefs, Config * config,
if(fp == NULL) if(fp == NULL)
return 1; return 1;
if(prefs->flags & PREFS_v) if(prefs->flags & PREFS_v)
printf("%s%s%s%s\n", "Creating config.", extension, " in ", printf("%s%s/%s%s\n", "Creating ", directory, "config.",
directory); extension);
switch(i) switch(i)
{ {
case ST_H: case ST_H:
@ -128,10 +128,17 @@ static int _do_h(Prefs * prefs, Config * config, FILE * fp,
fprintf(fp, "%s%s%s%s%s%s", "#define PACKAGE \"", package, "\"\n", fprintf(fp, "%s%s%s%s%s%s", "#define PACKAGE \"", package, "\"\n",
"#define VERSION \"", version, "\"\n"); "#define VERSION \"", version, "\"\n");
if((p = prefs->prefix) != NULL || (p = config_get(config, "", "prefix")) if((p = prefs->prefix) != NULL
!= NULL) || (p = config_get(config, "", "prefix")) != NULL)
fprintf(fp, "%s%s%s", "\n#ifndef PREFIX\n\ fprintf(fp, "%s%s%s", "\n#ifndef PREFIX\n\
# define PREFIX \"", p, "\"\n#endif\n"); # define PREFIX \"", p, "\"\n#endif\n");
if((p = prefs->libdir) != NULL
|| (p = config_get(config, "", "libdir")) != NULL)
{
fprintf(fp, "%s", "\n#ifndef LIBDIR\n# define LIBDIR ");
fprintf(fp, "%s%s", p[0] == '/' ? "\"" : "PREFIX \"", p);
fprintf(fp, "%s", "\"\n#endif\n");
}
return 0; return 0;
} }
@ -142,8 +149,12 @@ static int _do_sh(Prefs * prefs, Config * config, FILE * fp,
fprintf(fp, "%s%s%s%s%s%s", "PACKAGE=\"", package, "\"\n", fprintf(fp, "%s%s%s%s%s%s", "PACKAGE=\"", package, "\"\n",
"VERSION=\"", version, "\"\n"); "VERSION=\"", version, "\"\n");
if((p = prefs->prefix) != NULL || (p = config_get(config, "", "prefix")) if((p = prefs->prefix) != NULL
!= NULL) || (p = config_get(config, "", "prefix")) != NULL)
fprintf(fp, "%s%s%s", "\nPREFIX=\"", p, "\"\n"); fprintf(fp, "%s%s%s", "\nPREFIX=\"", p, "\"\n");
if((p = prefs->libdir) != NULL
|| (p = config_get(config, "", "libdir")) != NULL)
fprintf(fp, "%s%s%s%s", "LIBDIR=\"", p[0] == '/' ? ""
: "${PREFIX}/", p, "\"\n");
return 0; return 0;
} }