--- Makefile.orig	Wed Oct 19 03:21:24 2005
+++ Makefile	Thu Jan 11 09:26:37 2007
@@ -21,20 +21,22 @@
 	$(MKDIR) $(I_LIB)
 	$(MKDIR) $(I_GPR)
 	$(MKDIR) $(I_GPS)
+	$(INSTALL_DATA) gnat/*.ads gnat/*.adb $(I_INC)
+	$(INSTALL_DATA) asis/*.ads asis/*.adb $(I_INC)
+	$(INSTALL_DATA) lib/*.ali $(I_LIB)
+	$(CHMOD) a-w $(I_LIB)/*.ali
+	$(INSTALL_DATA) lib/libasis$(arext) $(I_LIB)
+	$(CHMOD) a-w $(I_LIB)/libasis$(arext)
+	$(INSTALL_DATA) asis/asis.gpr $(I_GPR)
+	$(INSTALL_DATA) documentation/gps_index.xml $(I_GPS)/asis.xml
+
+install-docs:
 	$(MKDIR) $(I_DOC)/html
 	$(MKDIR) $(I_DOC)/info
 	$(MKDIR) $(I_DOC)/pdf
-	$(INSTALL_FILES) lib/*.ali $(I_LIB)
-	$(CHMOD) a-w $(I_LIB)/*.ali
-	$(INSTALL_FILES) lib/libasis$(arext) $(I_LIB)
-	$(CHMOD) a-w $(I_LIB)/libasis$(arext)
-	$(INSTALL_FILES) gnat/*.ads gnat/*.adb $(I_INC)
-	$(INSTALL_FILES) asis/*.ads asis/*.adb $(I_INC)
-	$(INSTALL_FILES) asis/asis.gpr $(I_GPR)
-	$(INSTALL_FILES) documentation/*.html $(I_DOC)/html/
-	$(INSTALL_FILES) documentation/*.pdf  $(I_DOC)/pdf/
-	$(INSTALL_FILES) documentation/*.info $(I_DOC)/info/
-	$(INSTALL_FILES) documentation/gps_index.xml $(I_GPS)/asis.xml
+	$(INSTALL_DATA) documentation/*.html $(I_DOC)/html/
+	$(INSTALL_DATA) documentation/*.pdf  $(I_DOC)/pdf/
+	$(INSTALL_DATA) documentation/*.info $(I_DOC)/info/
 
 lib/libasis$(arext): force
 	gnat make -Pasis_bld -XBLD=$(BLD) -XOPSYS=$(OPSYS)
@@ -50,11 +52,11 @@
 
 install-asistant: asistant
 	$(MKDIR) $(I_BIN)
-	$(INSTALL_FILES) tools/asistant/asistant$(exe_ext) $(I_BIN)
+	$(INSTALL_PROGRAM) tools/asistant/asistant$(exe_ext) $(I_BIN)
 
 install-gnat%: gnat%
 	$(MKDIR) $(I_BIN)
-	$(INSTALL_FILES) tools/gnat$*/gnat$*$(exe_ext) $(I_BIN)
+	$(INSTALL_PROGRAM) tools/gnat$*/gnat$*$(exe_ext) $(I_BIN)
 atre:
 	gnat make -Ptools/$@/$@