--- a/Makefile	2012-12-18 14:37:30.235076000 +0400
+++ b/Makefile	2012-12-18 14:38:19.039705258 +0400
@@ -3,7 +3,8 @@
 GPRBUILD  = gprbuild
 GPRCLEAN = gprclean
 
-INSTALL:=$(shell exec=`which gprbuild`;if [ ! -x "$$exec" ]; then unset exec;fi;echo $$exec | sed -e 's/\/bin\/$(GPRBUILD).*//')
+DESTDIR ?=
+INSTALL ?= ${DESTDIR}
 
 ifeq ($(RTS),)
    RTS=full
--- a/Makefile	2012-12-18 14:42:07.194647510 +0400
+++ b/Makefile	2012-12-18 14:43:25.342652766 +0400
@@ -73,7 +73,8 @@
         done
 	-$(CP) support/aunit.xml $(I_PLG)
 
-	-$(CPR) lib/gnat lib/aunit $(INSTALL)/lib
+	-$(CPR) lib/gnat $(INSTALL)/${ADA_PROJECT_PATH}
+	-$(CPR) lib/aunit $(INSTALL)/${libdir}
 	-$(CPR) include/aunit $(INSTALL)/include
 	-$(CPR) share/examples $(INSTALL)/share
 	@echo '------------------------------------------------------------------'
--- a/Makefile	2012-12-18 14:43:57.903074436 +0400
+++ b/Makefile	2012-12-18 14:45:40.415399574 +0400
@@ -3,6 +3,7 @@
 GPRBUILD  = gprbuild
 GPRCLEAN = gprclean
 
+libdir ?= /usr/local/lib
 DESTDIR ?=
 INSTALL ?= ${DESTDIR}
 
@@ -26,12 +27,12 @@
 
 # Install directories
 
-I_INC   = $(INSTALL)/include/aunit
-I_LIB   = $(INSTALL)/lib/aunit
-I_GPR   = $(INSTALL)/lib/gnat
-I_TPL   = $(INSTALL)/share/examples/aunit
-I_DOC   = $(INSTALL)/share/doc/aunit
-I_PLG   = $(INSTALL)/share/gps/plug-ins
+I_INC   = $(INSTALL)/usr/include/aunit
+I_LIB   = $(INSTALL)/${libdir}/aunit
+I_GPR   = $(INSTALL)/${ADA_PROJECT_PATH}
+I_TPL   = $(INSTALL)/usr/share/aunit/examples
+I_DOC   = $(INSTALL)/usr/share/doc/aunit
+I_PLG   = $(INSTALL)/usr/share/gps/plug-ins
 
 .PHONY: all clean targets install_clean install
 
--- a/Makefile	2012-12-18 14:45:58.920638398 +0400
+++ b/Makefile	2012-12-18 14:46:06.257732858 +0400
@@ -28,7 +28,7 @@
 # Install directories
 
 I_INC   = $(INSTALL)/usr/include/aunit
-I_LIB   = $(INSTALL)/${libdir}/aunit
+I_LIB   ?= $(INSTALL)/${libdir}/aunit
 I_GPR   = $(INSTALL)/${ADA_PROJECT_PATH}
 I_TPL   = $(INSTALL)/usr/share/aunit/examples
 I_DOC   = $(INSTALL)/usr/share/doc/aunit
 
--- a/Makefile	2012-12-18 14:52:19.969066713 +0400
+++ b/Makefile	2012-12-18 14:52:43.749340964 +0400
@@ -27,12 +27,12 @@
 
 # Install directories
 
-I_INC   = $(INSTALL)/usr/include/aunit
-I_LIB   ?= $(INSTALL)/${libdir}/aunit
-I_GPR   = $(INSTALL)/${ADA_PROJECT_PATH}
-I_TPL   = $(INSTALL)/usr/share/aunit/examples
-I_DOC   = $(INSTALL)/usr/share/doc/aunit
-I_PLG   = $(INSTALL)/usr/share/gps/plug-ins
+I_INC   ?= $(INSTALL)/usr/include/
+I_LIB   ?= $(INSTALL)/usr/lib/aunit
+I_GPR   ?= $(INSTALL)/${ADA_PROJECT_PATH}
+I_TPL   ?= $(INSTALL)/usr/share/aunit/examples
+I_DOC   ?= $(INSTALL)/usr/share/doc/aunit
+I_PLG   ?= $(INSTALL)/usr/share/gps/plug-ins
 
 .PHONY: all clean targets install_clean install
 
--- a/Makefile	2012-12-18 14:52:56.866496369 +0400
+++ b/Makefile	2012-12-18 14:53:49.150105794 +0400
@@ -33,6 +33,7 @@
 I_TPL   ?= $(INSTALL)/usr/share/aunit/examples
 I_DOC   ?= $(INSTALL)/usr/share/doc/aunit
 I_PLG   ?= $(INSTALL)/usr/share/gps/plug-ins
+I_DAT   ?= $(INSTALL)/usr/share
 
 .PHONY: all clean targets install_clean install
 
@@ -75,9 +76,9 @@
 	-$(CP) support/aunit.xml $(I_PLG)
 
 	-$(CPR) lib/gnat $(INSTALL)/${ADA_PROJECT_PATH}
-	-$(CPR) lib/aunit $(INSTALL)/${libdir}
-	-$(CPR) include/aunit $(INSTALL)/include
-	-$(CPR) share/examples $(INSTALL)/share
+	-$(CPR) lib/aunit $(I_LIB)
+	-$(CPR) include/aunit $(I_INC)
+	-$(CPR) share/examples $(I_DAT)
 	@echo '------------------------------------------------------------------'
 	@echo '--  AUnit has now been installed.'
 	@echo '--  To be able to use the library, you may need to update your'
--- a/Makefile	2012-12-18 14:54:15.556419351 +0400
+++ b/Makefile	2012-12-18 14:54:38.164686043 +0400
@@ -33,7 +33,7 @@
 I_TPL   ?= $(INSTALL)/usr/share/aunit/examples
 I_DOC   ?= $(INSTALL)/usr/share/doc/aunit
 I_PLG   ?= $(INSTALL)/usr/share/gps/plug-ins
-I_DAT   ?= $(INSTALL)/usr/share
+I_DA   ?= $(INSTALL)/usr/share
 
 .PHONY: all clean targets install_clean install
 
@@ -78,7 +78,7 @@
 	-$(CPR) lib/gnat $(INSTALL)/${ADA_PROJECT_PATH}
 	-$(CPR) lib/aunit $(I_LIB)
 	-$(CPR) include/aunit $(I_INC)
-	-$(CPR) share/examples $(I_DAT)
+	-$(CPR) share/examples $(I_DAT)/aunit
 	@echo '------------------------------------------------------------------'
 	@echo '--  AUnit has now been installed.'
 	@echo '--  To be able to use the library, you may need to update your'
--- a/Makefile	2012-12-18 15:02:04.588129891 +0400
+++ b/Makefile	2012-12-18 15:02:24.251373785 +0400
@@ -75,7 +75,7 @@
         done
 	-$(CP) support/aunit.xml $(I_PLG)
 
-	-$(CPR) lib/gnat $(INSTALL)/${ADA_PROJECT_PATH}
+	-$(CPR) lib/gnat/* $(INSTALL)/${ADA_PROJECT_PATH}
 	-$(CPR) lib/aunit $(I_LIB)
 	-$(CPR) include/aunit $(I_INC)
 	-$(CPR) share/examples $(I_DAT)/aunit