From ab385ea63cd2ca78279fc22f81992667ccd6024d Mon Sep 17 00:00:00 2001
From: Thomas Nagy <tnagy2pow10@gmail.com>
Date: Sun, 23 Sep 2012 19:49:17 +0200
Subject: [PATCH] #1202

---
 ChangeLog                | 2 ++
 waflib/Tools/gnu_dirs.py | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1a3b415a..5d8eca1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ NEW IN WAF 1.7.3
 * Use the same function signature main(int, char**) in all configuration tests #1192
 * Fixed the Clang version number detection #1191
 * Let the feature 'includes' propagate INCLUDES and FRAMEWORKPATH variables
+* Fix for incorrect installation paths #1202
+* Cabal script (haskell)
 
 NEW IN WAF 1.7.2
 ----------------
diff --git a/waflib/Tools/gnu_dirs.py b/waflib/Tools/gnu_dirs.py
index ac9d836d..918947eb 100644
--- a/waflib/Tools/gnu_dirs.py
+++ b/waflib/Tools/gnu_dirs.py
@@ -78,10 +78,6 @@ def configure(conf):
 	env = conf.env
 	env.LIBDIR = env.BINDIR = []
 	env.EXEC_PREFIX = get_param('EXEC_PREFIX', env.PREFIX)
-	corner_case = False
-	if str(env.PREFIX) == '/usr': # Issue 722, corner case
-		corner_case = True
-		env.PREFIX = ''
 	env.PACKAGE = getattr(Context.g_module, 'APPNAME', None) or env.PACKAGE
 
 	complete = False
@@ -97,9 +93,6 @@ def configure(conf):
 				except TypeError:
 					complete = False
 
-	if corner_case:
-		env.PREFIX = '/usr'
-
 	if not complete:
 		lst = [name for name, _, _ in _options if not env[name.upper()]]
 		raise conf.errors.WafError('Variable substitution failure %r' % lst)