* Makefile.in: Use a different variable name for subdirectory since the

previous one was used by the top level make.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index e30cb52..33b4264 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 20 18:58:12 2000  Christopher Faylor <cgf@cygnus.com>
+
+       * Makefile.in: Use a different variable name for subdirectory since the
+       previous one was used by the top level make.
+
 Sun Nov 19 20:50:51 2000  Christopher Faylor <cgf@cygnus.com>
 
        * Makefile.in: Install mingw stuff in a subdirectory if building under

diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 4b49c89..1729e07 100644 (file)
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -54,7 +54,7 @@ CXXFLAGS = @CXXFLAGS@
 # compiling with Cygwin?
 MNO_CYGWIN = @MNO_CYGWIN@
 ifdef MNO_CYGWIN
-libsubdir=/mingw
+subdirforlib=/mingw
 else
 libdir=
 endif
@@ -207,14 +207,14 @@ install-info: info
 
 install-dirs:
        $(mkinstalldirs) $(bindir)
-       $(mkinstalldirs) $(tooldir)/lib$(libsubdir)
+       $(mkinstalldirs) $(tooldir)/lib$(subdirforlib)
 
 install: all install-dirs $(install_dlls_host)
        for i in $(LIBS); do \
-               $(INSTALL_DATA) $$i $(tooldir)/lib$(libsubdir)/$$i ; \
+               $(INSTALL_DATA) $$i $(tooldir)/lib$(subdirforlib)/$$i ; \
        done
        for i in $(CRT0S); do \
-               $(INSTALL_DATA) $$i $(tooldir)/lib/$(libsubdir)/$$i ; \
+               $(INSTALL_DATA) $$i $(tooldir)/lib/$(subdirforlib)/$$i ; \
        done
        for sub in . sys ; do \
                dstdir=$(tooldir)/include/$(HEADER_SUBDIR)/$$sub ; \