--- a/Makefile.in	2011-07-16 11:17:09.335569486 +0400
+++ b/Makefile.in	2011-07-16 11:19:13.406569528 +0400
@@ -2,7 +2,7 @@
 ##   relocatable
 ##   static
 LIBRARY_TYPE=static
-
+DESTDIR ?= 
 # Replace with the location for the installation directory
 INSTALL=@INSTALL@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
@@ -114,30 +114,30 @@
 	cd ${xmllib}; ${CHMOD} ugo-w *.ali
 
 install_dirs: force
-	@${MKDIR} ${bindir}
-	@${MKDIR} ${xmllib}
-	@${MKDIR} ${libdir}/gnat/xmlada
-	@${MKDIR} ${datadir}/doc/xmlada
-	@${MKDIR} ${includedir}/xmlada
-	@${MKDIR} ${datadir}/gps/plug-ins/
+	@${MKDIR} ${DESTDIR}/${bindir}
+	@${MKDIR} ${DESTDIR}/${xmllib}
+	@${MKDIR} ${DESTDIR}/${libdir}/gnat/xmlada
+	@${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada
+	@${MKDIR} ${DESTDIR}/${includedir}/xmlada
+	@${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/
 
 ## Do the installation for either shared or static, depending on
 ## $LIBRARY_TYPE
 install_library_type: install_dirs ${MODULE_INSTALL}
-	${INSTALL} distrib/xmlada_shared.gpr         ${libdir}/gnat
-	${INSTALL} distrib/xmlada.gpr                ${libdir}/gnat/
-	${INSTALL} distrib/xmlada_dom.gpr            ${libdir}/gnat/
-	${INSTALL} distrib/xmlada_sax.gpr            ${libdir}/gnat/
-	${INSTALL} distrib/xmlada_input.gpr          ${libdir}/gnat/
-	${INSTALL} distrib/xmlada_schema.gpr         ${libdir}/gnat/
-	${INSTALL} distrib/xmlada_unicode.gpr        ${libdir}/gnat/
-	${INSTALL} xmlada-config  ${bindir}
-	-${INSTALL} docs/xml.ps   ${datadir}/doc/xmlada 2>/dev/null
-	-${INSTALL} docs/xml.pdf  ${datadir}/doc/xmlada
-	-${INSTALL} docs/xml.html ${datadir}/doc/xmlada
-	-${INSTALL} docs/xml.info ${datadir}/doc/xmlada
-	${CHMOD} +x ${bindir}/xmlada-config
-	${INSTALL} distrib/xmlada_gps.py ${datadir}/gps/plug-ins/
+	${INSTALL} distrib/xmlada_shared.gpr         ${DESTDIR}/${libdir}/gnat
+	${INSTALL} distrib/xmlada.gpr                ${DESTDIR}/${libdir}/gnat/
+	${INSTALL} distrib/xmlada_dom.gpr            ${DESTDIR}/${libdir}/gnat/
+	${INSTALL} distrib/xmlada_sax.gpr            ${DESTDIR}/${libdir}/gnat/
+	${INSTALL} distrib/xmlada_input.gpr          ${DESTDIR}/${libdir}/gnat/
+	${INSTALL} distrib/xmlada_schema.gpr         ${DESTDIR}/${libdir}/gnat/
+	${INSTALL} distrib/xmlada_unicode.gpr        ${DESTDIR}/${libdir}/gnat/
+	${INSTALL} xmlada-config  ${DESTDIR}/${bindir}
+	-${INSTALL} docs/xml.ps   ${DESTDIR}/${datadir}/doc/xmlada 2>/dev/null
+	-${INSTALL} docs/xml.pdf  ${DESTDIR}/${datadir}/doc/xmlada
+	-${INSTALL} docs/xml.html ${DESTDIR}/${datadir}/doc/xmlada
+	-${INSTALL} docs/xml.info ${DESTDIR}/${datadir}/doc/xmlada
+	${CHMOD} +x ${DESTDIR}/${bindir}/xmlada-config
+	${INSTALL} distrib/xmlada_gps.py ${DESTDIR}/${datadir}/gps/plug-ins/
 
 ## Do the installation for an explicit target
 install_static: 
--- a/Makefile.in	2011-07-16 11:21:57.232569582 +0400
+++ b/Makefile.in	2011-07-16 11:22:12.952569588 +0400
@@ -1,7 +1,7 @@
 ## The type of library we want to build. Possible values:
 ##   relocatable
 ##   static
-LIBRARY_TYPE=static
+LIBRARY_TYPE=relocatable
 DESTDIR ?= 
 # Replace with the location for the installation directory
 INSTALL=@INSTALL@
--- a/Makefile.in	2011-07-16 11:27:57.295569704 +0400
+++ b/Makefile.in	2011-07-16 11:30:25.628569754 +0400
@@ -91,27 +91,27 @@
 
 # Rule for installing the modules
 %_inst: force
-	${CP} $*/*.ad[bs]        ${includedir}/xmlada
-	cd $*; ls *.ad[bs] > ${libdir}/gnat/xmlada/xmlada_$*.lgpr
-	-cd ${xmllib}; ${CHMOD} ugo+w *.ali
-	-${CP} $*/lib/${LIBRARY_TYPE}/*.ali   ${xmllib}
-	${RM} ${libdir}/libxmlada_$**
-	${RM} ${xmllib}libxmlada_$**
+	${CP} $*/*.ad[bs]        ${DESTDIR}/${includedir}/xmlada
+	cd $*; ls *.ad[bs] > ${DESTDIR}/${libdir}/gnat/xmlada/xmlada_$*.lgpr
+	-cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali
+	-${CP} $*/lib/${LIBRARY_TYPE}/*.ali   ${DESTDIR}/${xmllib}
+	${RM} ${DESTDIR}/${libdir}/libxmlada_$**
+	${RM} ${DESTDIR}/${xmllib}libxmlada_$**
 ifeq (${LIBRARY_TYPE},static)
-	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${xmllib}
+	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.a ${DESTDIR}/${xmllib}
 else
 ifeq (${OS},Windows_NT)
 	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} ${xmllib}
 	cd ${bindir}; ${CP} ${libdir}/xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT} libxmlada_$*.${LIBEXT}
 else
-	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${xmllib}
-	cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
-	cd ${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
-	cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
-	cd ${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
+	${INSTALL} $*/lib/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} ${DESTDIR}/${xmllib}
+	cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}
+	cd ${DESTDIR}/${xmllib}; ${LN_S} libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
+	cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${basename ${VERSION}}
+	cd ${DESTDIR}/${libdir}; ${LN_S} xmlada/${LIBRARY_TYPE}/libxmlada_$*.${LIBEXT}.${VERSION} libxmlada_$*.${LIBEXT}.${VERSION}
 endif
 endif
-	cd ${xmllib}; ${CHMOD} ugo-w *.ali
+	cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo-w *.ali
 
 install_dirs: force
 	@${MKDIR} ${DESTDIR}/${bindir}
--- a/Makefile.in	2011-07-16 11:47:49.580570102 +0400
+++ b/Makefile.in	2011-07-16 11:49:47.465570142 +0400
@@ -92,7 +92,7 @@
 # Rule for installing the modules
 %_inst: force
 	${CP} $*/*.ad[bs]        ${DESTDIR}/${includedir}/xmlada
-	cd $*; ls *.ad[bs] > ${DESTDIR}/${libdir}/gnat/xmlada/xmlada_$*.lgpr
+	cd $*; ls *.ad[bs] > ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada/xmlada_$*.lgpr
 	-cd ${DESTDIR}/${xmllib}; ${CHMOD} ugo+w *.ali
 	-${CP} $*/lib/${LIBRARY_TYPE}/*.ali   ${DESTDIR}/${xmllib}
 	${RM} ${DESTDIR}/${libdir}/libxmlada_$**
@@ -116,7 +116,7 @@
 install_dirs: force
 	@${MKDIR} ${DESTDIR}/${bindir}
 	@${MKDIR} ${DESTDIR}/${xmllib}
-	@${MKDIR} ${DESTDIR}/${libdir}/gnat/xmlada
+	@${MKDIR} ${DESTDIR}/${ADA_PROJECT_PATH}/xmlada
 	@${MKDIR} ${DESTDIR}/${datadir}/doc/xmlada
 	@${MKDIR} ${DESTDIR}/${includedir}/xmlada
 	@${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins/
@@ -124,13 +124,13 @@
 ## Do the installation for either shared or static, depending on
 ## $LIBRARY_TYPE
 install_library_type: install_dirs ${MODULE_INSTALL}
-	${INSTALL} distrib/xmlada_shared.gpr         ${DESTDIR}/${libdir}/gnat
-	${INSTALL} distrib/xmlada.gpr                ${DESTDIR}/${libdir}/gnat/
-	${INSTALL} distrib/xmlada_dom.gpr            ${DESTDIR}/${libdir}/gnat/
-	${INSTALL} distrib/xmlada_sax.gpr            ${DESTDIR}/${libdir}/gnat/
-	${INSTALL} distrib/xmlada_input.gpr          ${DESTDIR}/${libdir}/gnat/
-	${INSTALL} distrib/xmlada_schema.gpr         ${DESTDIR}/${libdir}/gnat/
-	${INSTALL} distrib/xmlada_unicode.gpr        ${DESTDIR}/${libdir}/gnat/
+	${INSTALL} distrib/xmlada_shared.gpr         ${DESTDIR}/${ADA_PROJECT_PATH}
+	${INSTALL} distrib/xmlada.gpr                ${DESTDIR}/${ADA_PROJECT_PATH}/
+	${INSTALL} distrib/xmlada_dom.gpr            ${DESTDIR}/${ADA_PROJECT_PATH}/
+	${INSTALL} distrib/xmlada_sax.gpr            ${DESTDIR}/${ADA_PROJECT_PATH}/
+	${INSTALL} distrib/xmlada_input.gpr          ${DESTDIR}/${ADA_PROJECT_PATH}/
+	${INSTALL} distrib/xmlada_schema.gpr         ${DESTDIR}/${ADA_PROJECT_PATH}/
+	${INSTALL} distrib/xmlada_unicode.gpr        ${DESTDIR}/${ADA_PROJECT_PATH}/
 	${INSTALL} xmlada-config  ${DESTDIR}/${bindir}
 	-${INSTALL} docs/xml.ps   ${DESTDIR}/${datadir}/doc/xmlada 2>/dev/null
 	-${INSTALL} docs/xml.pdf  ${DESTDIR}/${datadir}/doc/xmlada