From d454b9c723f3346fbade39001e8bbbe2b344a4e6 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Thu, 20 Sep 2012 22:14:10 +0000 Subject: [PATCH] Detect DeforaOS explicitly rather than "likely UNIX" --- src/configure.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/configure.c b/src/configure.c index d7053dd..a0ca030 100644 --- a/src/configure.c +++ b/src/configure.c @@ -390,18 +390,21 @@ static void _prefs_init(Prefs * prefs) memset(prefs, 0, sizeof(Prefs)); prefs->destdir = ""; - if(stat("/usr", &st) == 0) /* FIXME see below */ + if(stat("/Apps", &st) == 0) + { + prefs->bindir = "Binaries"; + prefs->includedir = "Includes"; + prefs->libdir = "Libraries"; + /* XXX needs auto-detection for the sub-directory */ + prefs->prefix = "/Apps"; + } + else { prefs->bindir = "bin"; prefs->includedir = "include"; prefs->libdir = "lib"; prefs->prefix = "/usr/local"; - return; } - prefs->bindir = "Binaries"; - prefs->includedir = "Includes"; - prefs->libdir = "Libraries"; - prefs->prefix = "/Apps"; /* FIXME detect System or Apps/x first */ }