* Makefile.in: Install mingw stuff in a subdirectory if building under cygwin.

This commit is contained in:
Christopher Faylor 2000-11-20 01:52:26 +00:00
parent 86d2c003fe
commit 7665ae4aca
2 changed files with 16 additions and 4 deletions

View File

@ -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> Sat Jun 17 21:48:23 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.in (subdirs): Eliminate for loop. * Makefile.in (subdirs): Eliminate for loop.

View File

@ -53,6 +53,11 @@ CXXFLAGS = @CXXFLAGS@
# compiling with Cygwin? # compiling with Cygwin?
MNO_CYGWIN = @MNO_CYGWIN@ MNO_CYGWIN = @MNO_CYGWIN@
ifdef MNO_CYGWIN
libsubdir=/mingw
else
libdir=
endif
# Either crtdll (CRT_ID 1) or msvcrt (CRT_ID 2). # Either crtdll (CRT_ID 1) or msvcrt (CRT_ID 2).
RUNTIME = @RUNTIME@ RUNTIME = @RUNTIME@
@ -200,14 +205,16 @@ info-html:
install-info: info install-info: info
install: all $(install_dlls_host) install-dirs:
$(mkinstalldirs) $(bindir) $(mkinstalldirs) $(bindir)
$(mkinstalldirs) $(tooldir)/lib $(mkinstalldirs) $(tooldir)/lib$(libsubdir)
install: all install-dirs $(install_dlls_host)
for i in $(LIBS); do \ for i in $(LIBS); do \
$(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \ $(INSTALL_DATA) $$i $(tooldir)/lib$(libsubdir)/$$i ; \
done done
for i in $(CRT0S); do \ for i in $(CRT0S); do \
$(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \ $(INSTALL_DATA) $$i $(tooldir)/lib/$(libsubdir)/$$i ; \
done done
for sub in . sys ; do \ for sub in . sys ; do \
dstdir=$(tooldir)/include/$(HEADER_SUBDIR)/$$sub ; \ dstdir=$(tooldir)/include/$(HEADER_SUBDIR)/$$sub ; \