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

previous one was used by the top level make.
This commit is contained in:
Christopher Faylor 2000-11-21 00:00:05 +00:00
parent b63f2ed244
commit d5b692284b
2 changed files with 9 additions and 4 deletions

View File

@ -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> Sun Nov 19 20:50:51 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.in: Install mingw stuff in a subdirectory if building under * Makefile.in: Install mingw stuff in a subdirectory if building under

View File

@ -54,7 +54,7 @@ CXXFLAGS = @CXXFLAGS@
# compiling with Cygwin? # compiling with Cygwin?
MNO_CYGWIN = @MNO_CYGWIN@ MNO_CYGWIN = @MNO_CYGWIN@
ifdef MNO_CYGWIN ifdef MNO_CYGWIN
libsubdir=/mingw subdirforlib=/mingw
else else
libdir= libdir=
endif endif
@ -207,14 +207,14 @@ install-info: info
install-dirs: install-dirs:
$(mkinstalldirs) $(bindir) $(mkinstalldirs) $(bindir)
$(mkinstalldirs) $(tooldir)/lib$(libsubdir) $(mkinstalldirs) $(tooldir)/lib$(subdirforlib)
install: all install-dirs $(install_dlls_host) install: all install-dirs $(install_dlls_host)
for i in $(LIBS); do \ for i in $(LIBS); do \
$(INSTALL_DATA) $$i $(tooldir)/lib$(libsubdir)/$$i ; \ $(INSTALL_DATA) $$i $(tooldir)/lib$(subdirforlib)/$$i ; \
done done
for i in $(CRT0S); do \ for i in $(CRT0S); do \
$(INSTALL_DATA) $$i $(tooldir)/lib/$(libsubdir)/$$i ; \ $(INSTALL_DATA) $$i $(tooldir)/lib/$(subdirforlib)/$$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 ; \