--- a/Makefile	2017-07-07 18:37:43.979078000 +0200
+++ b/Makefile	2017-07-07 18:38:06.414034598 +0200
@@ -39,13 +39,12 @@
 
 install-clean:
 ifneq (,$(wildcard $(INSTALL)/lib/gnat/manifests/aunit))
-	-$(GPRINSTALL) $(GPROPTS) --uninstall --prefix=$(INSTALL) \
-		--project-subdir=lib/gnat aunit
+	-$(GPRINSTALL) $(GPROPTS) --uninstall --prefix=$(INSTALL) aunit
 endif
 
 install: install-clean
 	$(GPRINSTALL) $(GPROPTS) -p -f --prefix=$(INSTALL) \
-		--no-build-var --project-subdir=lib/gnat lib/gnat/aunit.gpr
+		--no-build-var lib/gnat/aunit.gpr
 
 .PHONY: doc
 doc:
--- a/lib/gnat/aunit.gpr	2017-07-07 18:39:21.361889609 +0200
+++ b/lib/gnat/aunit.gpr	2017-07-07 18:40:51.021716158 +0200
@@ -49,17 +49,16 @@
    -------------
 
    package Install is
-      for Artifacts ("share/doc/aunit/pdf")
+      for Artifacts ("usr/share/doc/aunit/pdf")
         use ("../../doc/pdf/**");
-      for Artifacts ("share/doc/aunit/txt")
+      for Artifacts ("usr/share/doc/aunit/txt")
         use ("../../doc/txt/**");
-      for Artifacts ("share/doc/aunit/info")
+      for Artifacts ("usr/share/doc/aunit/info")
         use ("../../doc/info/**");
-      for Artifacts ("share/doc/aunit/html")
+      for Artifacts ("usr/share/doc/aunit/html")
         use ("../../doc/html/**");
 
-      for Artifacts ("share/gps/plug-ins") use ("../../support/aunit.xml");
-      for Artifacts ("share/examples/aunit") use ("../../examples/*");
+      for Artifacts ("usr/share/doc/aunit/examples") use ("../../examples/*");
    end Install;
 
 end AUnit;