* lib/Makefile.in: Use make function to locate .mri file to allow building in

directory other than source directory.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4b1d024..c4a02e7 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-27  Christopher Faylor  <cgf@redhat.com>
+
+       * lib/Makefile.in: Use make function to locate .mri file to allow
+       building in directory other than source directory.
+
 2003-11-27  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * lib/vfw32.def: Remove, replacing with ...

diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index ad14441..377a60b 100644 (file)
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -172,9 +172,9 @@ libuuid.a : $(UUID_OBJS)
 # seems to be the simplest way to combine them into one archive.
 # NB: With older dlltool, the object file members will not have unique
 # names.
-libvfw32.a : libmsvfw32.a libavifil32.a libavicap32.a vfw32.mri
+libvfw32.a : vfw32.mri libmsvfw32.a libavifil32.a libavicap32.a
        rm -f $@
-       $(AR) -M < vfw32.mri
+       $(AR) -M < ${word 1,$^}
        $(RANLIB) $@
 
 lib%.a : %.def %.o