--- Makefile.in-0.21	2006-01-26 22:33:32.151790000 +1300
+++ Makefile.in	2006-01-26 22:38:05.288860000 +1300
@@ -81,7 +81,7 @@
 T_ADAFLAGS =
 
 CC = cc
-ADAC = $(CC)
+ADAC = gnatgcc
 
 ECHO = echo
 CHMOD = chmod
@@ -503,7 +503,7 @@
 run-bind.adb: grt-force
 	gnatmake -c $(GNATFLAGS) -aI$(GRTSRCDIR) $(GRT_PRAGMA_FLAG) ghdl_main \
 	  $(GRT_ADAFLAGS) -cargs $(GRT_FLAGS)
-	gnatbind -Lgrt_ -o run-bind.adb -n ghdl_main.ali
+	gnatbind -t -Lgrt_ -o run-bind.adb -n ghdl_main.ali
 
 run-bind.o: run-bind.adb
 	$(GRT_ADACOMPILE)
@@ -564,8 +564,7 @@
 # Also remove -lgnat and its associated -L flags.  This appears to be required
 #  with GNAT GPL 2005.
 grt-files.in: grt-files
-	sed -e "\!^./!d" -e "/-shared/d" -e "/-static/d" -e "/-lgnat/d" \
-	  -e "\X-L/Xd" < $< > $@
+	sed -e "\!^./!d" -e "/-shared/d" < $< > $@
 
 grt.lst: grt-files.in
 	echo "@/libgrt.a" > $@