* Makerules (version-renames.def): Target removed.

	(Versions.all): Depend on soversions.i directly and parse it.

2 files changed, 9 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index cd4f0f5ef3..49e6bf76ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-03-19  Roland McGrath  <roland@baalperazim.frob.com>
 
+	* Makerules (version-renames.def): Target removed.
+	(Versions.all): Depend on soversions.i directly and parse it.
+
 	* Makeconfig (soversions.i): New target, input-reading parts of
 	soversions.mk generation moved here; result is a canonicalized
 	list "LIB VERSION [SET]" for this configuration.
diff --git a/Makerules b/Makerules
index 8535d10ddd..2ee7e7e278 100644
--- a/Makerules
+++ b/Makerules
@@ -290,16 +290,15 @@ ifneq ($(sysd-versions-subdirs),$(all-subdirs) $(config-sysdirs))
 sysd-versions-force = FORCE
 FORCE:
 endif
-$(common-objpfx)version-renames.def: $(common-objpfx)soversions.i
-	while read lib version setname; do \
-	  test -z "$$setname" || echo "$$lib : $$setname"; \
-	done < $< > $@T; exit 0
-	mv -f $@T $@
 $(common-objpfx)Versions.all: $(..)scripts/firstversions.awk \
-			      $(common-objpfx)version-renames.def \
+			      $(common-objpfx)soversions.i \
 	                      $(..)Versions.def \
 			      $(wildcard $(add-ons:%=$(..)%/Versions.def))
-	cat $(filter-out $<,$^) | LC_ALL=C $(AWK) -f $< > $@T
+	{ while read lib version setname; do \
+	    test -z "$$setname" || echo "$$lib : $$setname"; \
+	  done < $(word 2,$^); \
+	  cat $(filter-out $< $(word 2,$^),$^); \
+	} | LC_ALL=C $(AWK) -f $< > $@T
 	mv -f $@T $@
 $(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \
 			       $(..)scripts/versions.awk \