diff options
| -rw-r--r-- | winsup/mingw/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/mingw/Makefile.in | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog index d75521d0a..e30cb52e8 100644 --- a/winsup/mingw/ChangeLog +++ b/winsup/mingw/ChangeLog @@ -1,3 +1,8 @@ +Sun Nov 19 20:50:51 2000 Christopher Faylor <cgf@cygnus.com> + + * Makefile.in: Install mingw stuff in a subdirectory if building under + cygwin. + Sat Jun 17 21:48:23 2000 Christopher Faylor <cgf@cygnus.com> * Makefile.in (subdirs): Eliminate for loop. diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in index 65abdd7e2..4b49c89de 100644 --- a/winsup/mingw/Makefile.in +++ b/winsup/mingw/Makefile.in @@ -53,6 +53,11 @@ CXXFLAGS = @CXXFLAGS@ # compiling with Cygwin? MNO_CYGWIN = @MNO_CYGWIN@ +ifdef MNO_CYGWIN +libsubdir=/mingw +else +libdir= +endif # Either crtdll (CRT_ID 1) or msvcrt (CRT_ID 2). RUNTIME = @RUNTIME@ @@ -200,14 +205,16 @@ info-html: install-info: info -install: all $(install_dlls_host) +install-dirs: $(mkinstalldirs) $(bindir) - $(mkinstalldirs) $(tooldir)/lib + $(mkinstalldirs) $(tooldir)/lib$(libsubdir) + +install: all install-dirs $(install_dlls_host) for i in $(LIBS); do \ - $(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \ + $(INSTALL_DATA) $$i $(tooldir)/lib$(libsubdir)/$$i ; \ done for i in $(CRT0S); do \ - $(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \ + $(INSTALL_DATA) $$i $(tooldir)/lib/$(libsubdir)/$$i ; \ done for sub in . sys ; do \ dstdir=$(tooldir)/include/$(HEADER_SUBDIR)/$$sub ; \ |