--- a/support/aunit.gpr	2010-06-04 14:21:25.000000000 +0400
+++ b/support/aunit.gpr	2011-03-25 22:26:20.841001221 +0300
@@ -1,20 +1,23 @@
+with "directories";
 with "aunit_shared";
 
 project AUnit is
 
-   for Library_Dir use
-     "../../lib/aunit/" & AUnit_Shared.Target & "-" & AUnit_Shared.Runtime;
+for Library_Dir use
+    Directories.Libdir & "/aunit/" & AUnit_Shared.Target & "-" & AUnit_Shared.Runtime;
 
-   for Library_Name use "aunit";
-   for Library_Kind use "static";
-   for Externally_Built use "true";
+    for Library_Name use "aunit";
+    for Library_Kind use "relocatable";
+    for Library_Version use
+        "lib" & Project'Library_Name & ".so." & Version;
+    for Externally_Built use "true";
 
    for Source_Dirs use
-     ("../../include/aunit/framework",
-      "../../include/aunit/containers",
-      "../../include/aunit/reporters",
-      "../../include/aunit/framework/" & AUnit_Shared.Except,
-      "../../include/aunit/framework/" & AUnit_Shared.Calend,
-      "../../include/aunit/framework/" & AUnit_Shared.Memory);
+     (Directories.Includedir & "/aunit/framework",
+      Directories.Includedir & "/aunit/containers",
+      Directories.Includedir & "/aunit/reporters",
+      Directories.Includedir & "/aunit/framework/" & AUnit_Shared.Except,
+      Directories.Includedir & "/aunit/framework/" & AUnit_Shared.Calend,
+      Directories.Includedir & "/aunit/framework/" & AUnit_Shared.Memory);
 
 end AUnit;