* Makefile.in (install): Remove dependency of install-only and

	recursively invoke make for install-only.
	* data-directory/Makefile.in: Add FLAGS_TO_PASS variable.
	(install): Pass FLAGS_TO_PASS when recursively make install-only.

	gdbserver/
	* Makefile.in: Add FLAGS_TO_PASS variable.
	(install): Remove dependency of install-only and recursively
	invoke make for install-only.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 66cea089dca7ba78444efaade5e3b916860aa380..a6fca05b02ab1f253d1c9e1bee7668413fc26388 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-22  Jie Zhang  <jie@codesourcery.com>
+
+       * Makefile.in (install): Remove dependency of install-only and
+       recursively invoke make for install-only.
+       * data-directory/Makefile.in: Add FLAGS_TO_PASS variable.
+       (install): Pass FLAGS_TO_PASS when recursively make install-only.
+
 2010-10-20  Hui Zhu  <teawater@gmail.com>
 
        * tracepoint.c (tfile_get_traceframe_address): Call

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b856c3a34679255394a5c20377b094c57842ef8f..f7355324d6e42c4b1be3d9fc99d784502c92340f 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -970,7 +970,8 @@ gdb.z:gdb.1
 # source file and doesn't care about rebuilding or just wants to save the
 # time it takes for make to check that all is up to date.
 # install-only is intended to address that need.
-install: all install-only 
+install: all
+       @$(MAKE) $(FLAGS_TO_PASS) install-only
 
 install-only: $(CONFIG_INSTALL)
        transformed_name=`t='$(program_transform_name)'; \

diff --git a/gdb/data-directory/Makefile.in b/gdb/data-directory/Makefile.in
index e60bc59d4975f212d431e87e5ffd5e4efa1bf4ea..9153a29a6ca5a3ba3b30636199a55a171dbd47a1 100644 (file)
--- a/gdb/data-directory/Makefile.in
+++ b/gdb/data-directory/Makefile.in
@@ -54,6 +54,38 @@ PYTHON_FILES = \
        gdb/__init__.py \
        gdb/types.py
 
+FLAGS_TO_PASS = \
+       "prefix=$(prefix)" \
+       "exec_prefix=$(exec_prefix)" \
+       "infodir=$(infodir)" \
+       "datarootdir=$(datarootdir)" \
+       "docdir=$(docdir)" \
+       "htmldir=$(htmldir)" \
+       "pdfdir=$(pdfdir)" \
+       "libdir=$(libdir)" \
+       "mandir=$(mandir)" \
+       "datadir=$(datadir)" \
+       "includedir=$(includedir)" \
+       "against=$(against)" \
+       "DESTDIR=$(DESTDIR)" \
+       "AR=$(AR)" \
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CC=$(CC)" \
+       "CFLAGS=$(CFLAGS)" \
+       "CXX=$(CXX)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "DLLTOOL=$(DLLTOOL)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "RANLIB=$(RANLIB)" \
+       "MAKEINFO=$(MAKEINFO)" \
+       "MAKEHTML=$(MAKEHTML)" \
+       "MAKEHTMLFLAGS=$(MAKEHTMLFLAGS)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "RUNTEST=$(RUNTEST)" \
+       "RUNTESTFLAGS=$(RUNTESTFLAGS)"
+
 .PHONY: all
 all: stamp-syscalls stamp-python
 
@@ -146,7 +178,7 @@ uninstall-python:
 # install-only is intended to address that need.
 .PHONY: install
 install: all
-       $(MAKE) install-only
+       @$(MAKE) $(FLAGS_TO_PASS) install-only
 
 .PHONY: install-only
 install-only: install-syscalls install-python

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index d368bb0b4551e77035443d1531ffcb443e4a898b..cbee17c35e751a029c4e1cfdc446cb417a738b6c 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-22  Jie Zhang  <jie@codesourcery.com>
+
+       * Makefile.in: Add FLAGS_TO_PASS variable.
+       (install): Remove dependency of install-only and recursively
+       invoke make for install-only.
+
 2010-10-04  Doug Evans  <dje@google.com>
 
        * Makefile.in (uninstall): Use $(DESTDIR).

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 51e85cb46ac736550a732ae184bf98f8cb01278f..7cf68da8902d475d8a6f7501322f2fa550cb5c8b 100644 (file)
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -151,6 +151,38 @@ XML_BUILTIN = @srv_xmlbuiltin@
 IPA_DEPFILES = @IPA_DEPFILES@
 extra_libraries = @extra_libraries@
 
+FLAGS_TO_PASS = \
+       "prefix=$(prefix)" \
+       "exec_prefix=$(exec_prefix)" \
+       "infodir=$(infodir)" \
+       "datarootdir=$(datarootdir)" \
+       "docdir=$(docdir)" \
+       "htmldir=$(htmldir)" \
+       "pdfdir=$(pdfdir)" \
+       "libdir=$(libdir)" \
+       "mandir=$(mandir)" \
+       "datadir=$(datadir)" \
+       "includedir=$(includedir)" \
+       "against=$(against)" \
+       "DESTDIR=$(DESTDIR)" \
+       "AR=$(AR)" \
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CC=$(CC)" \
+       "CFLAGS=$(CFLAGS)" \
+       "CXX=$(CXX)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "DLLTOOL=$(DLLTOOL)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "RANLIB=$(RANLIB)" \
+       "MAKEINFO=$(MAKEINFO)" \
+       "MAKEHTML=$(MAKEHTML)" \
+       "MAKEHTMLFLAGS=$(MAKEHTMLFLAGS)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "RUNTEST=$(RUNTEST)" \
+       "RUNTESTFLAGS=$(RUNTESTFLAGS)"
+
 # Prevent Sun make from putting in the machine type.  Setting
 # TARGET_ARCH to nothing works for SunOS 3, 4.0, but not for 4.1.
 .c.o:
@@ -163,7 +195,9 @@ all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
 # source file and doesn't care about rebuilding or just wants to save the
 # time it takes for make to check that all is up to date.
 # install-only is intended to address that need.
-install: all install-only
+install: all
+       @$(MAKE) $(FLAGS_TO_PASS) install-only
+
 install-only:
        n=`echo gdbserver | sed '$(program_transform_name)'`; \
        if [ x$$n = x ]; then n=gdbserver; else true; fi; \