From d5b692284b02ca019ed50fa33790c38f5c905d00 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Tue, 21 Nov 2000 00:00:05 +0000 Subject: [PATCH] * Makefile.in: Use a different variable name for subdirectory since the previous one was used by the top level make. --- winsup/mingw/ChangeLog | 5 +++++ winsup/mingw/Makefile.in | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index e30cb52e8..33b426458 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 20 18:58:12 2000 Christopher Faylor + + * 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 * Makefile.in: Install mingw stuff in a subdirectory if building under diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index 4b49c89de..1729e07ad 100644 --- 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 ; \