Make-lang.in: Stabilize new stamp-snames rule.

	* Make-lang.in: Stabilize new stamp-snames rule.
	Deal with relative source directories.

From-SVN: r145900

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index c4100a56f785e51d8e0367a0faf2ffbe3f3b2a71..7a26a68d0e1517d2455a7e82af44940dc6ecd38f 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -944,15 +944,16 @@ ada/sinfo.h : ada/sinfo.ads ada/xsinfo.adb
        $(CP) $^ ada/bldtools/sinfo
        (cd ada/bldtools/sinfo && $(GNATMAKE) -q xsinfo && ./xsinfo ../../sinfo.h )
 
-ada/snames.h ada/snames.ads ada/snames.adb : ada/stamp-snames
-       @true
-
+ada/snames.h ada/snames.ads ada/snames.adb : ada/stamp-snames ; @true
 ada/stamp-snames : ada/snames.ads-tmpl ada/snames.adb-tmpl ada/snames.h-tmpl ada/xsnamest.adb ada/xutil.ads ada/xutil.adb
        -$(MKDIR) ada/bldtools/snamest
        $(RM) $(addprefix ada/bldtools/snamest/,$(notdir $^))
        $(CP) $^ ada/bldtools/snamest
-       (cd ada/bldtools/snamest; gnatmake -q xsnamest ; ./xsnamest ; cp snames.ns ../../snames.ads ; cp snames.nb ../../snames.adb ; cp snames.nh ../../snames.h)
-       touch $@
+       (cd ada/bldtools/snamest; gnatmake -q xsnamest ; ./xsnamest )
+       $(srcdir)/../move-if-change ada/bldtools/snamest/snames.ns ada/snames.ads
+       $(srcdir)/../move-if-change ada/bldtools/snamest/snames.nb ada/snames.adb
+       $(srcdir)/../move-if-change ada/bldtools/snamest/snames.nh ada/snames.h
+       touch ada/stamp-snames
 
 ada/nmake.adb : ada/sinfo.ads ada/nmake.adt ada/xnmake.adb ada/xutil.ads ada/xutil.adb
        -$(MKDIR) ada/bldtools/nmake_b