gnulib/ -> gnulib/import/

[Pedro Alves <palves@redhat.com>]

On 04/18/2012 04:00 PM, Joel Brobecker wrote:

>> GNULIB_CFLAGS=-I$(srcdir)/gnulib/import -I$(GNULIB_BUILDDIR)/import
>>
>> isn't that confusing.  $(GNULIB_BUILDDIR)/import is the build of
>> the gnulib import.
>>
>> Would that make everybody happy?
> 
> That would be a good naming choice, indeed.


Okay, here's the first step.  I've decided to do this in two steps,
the first just moves the gnulib import, keeping everything else working
the same.

Here's what I checked in, without the move bits, or the regenerated bits.

2012-04-19  Pedro Alves  <palves@redhat.com>

	gdb/
	* gnulib/: Move whole directory ...
	* gnulib/import/: ... here, and re-rerun gnulib-tool to adjust.
	* Makefile.in (LIBGNU, INCGNU, GNULIB_H, CLEANDIRS)
	(REQUIRED_SUBDIRS, all-lib, gnulib/Makefile, ACLOCAL_AMFLAGS)
	(aclocal_m4_deps): Adjust.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
	* configure.ac: Adjust AC_OUTPUT output.

	gdbserver/
	* Makefile.in (LIBGNU, INCGNU): Adjust.
	(GNULIB_FLAGS_TO_PASS, GNULIB_H): Adjust.
	(all, install-only, uninstall, clean-info, all-lib, clean)
	(maintainer-clean, Makefile, gnulib/Makefile): Adjust.
	* configure.ac: Adjust AC_OUTPUT output.
	* aclocal.m4: Regenerate.
	* configure: Regenerate.
---
 gdb/Makefile.in                               |   64 +
 gdb/aclocal.m4                                |   36 -
 gdb/configure                                 |    8 
 gdb/configure.ac                              |    2 
 gdb/gdbserver/Makefile.in                     |   30 -
 gdb/gdbserver/aclocal.m4                      |   36 -
 gdb/gdbserver/configure                       |    8 
 gdb/gdbserver/configure.ac                    |    2 
 gdb/gnulib/Makefile.am                        |  383 --------
 gdb/gnulib/Makefile.in                        | 1157 -------------------------
 gdb/gnulib/dummy.c                            |   42 -
 gdb/gnulib/extra/snippet/arg-nonnull.h        |   26 -
 gdb/gnulib/extra/snippet/c++defs.h            |  271 ------
 gdb/gnulib/extra/snippet/warn-on-use.h        |  109 --
 gdb/gnulib/extra/update-copyright             |  274 ------
 gdb/gnulib/import/Makefile.am                 |  383 ++++++++
 gdb/gnulib/import/Makefile.in                 | 1157 +++++++++++++++++++++++++
 gdb/gnulib/import/dummy.c                     |   42 +
 gdb/gnulib/import/extra/snippet/arg-nonnull.h |   26 +
 gdb/gnulib/import/extra/snippet/c++defs.h     |  271 ++++++
 gdb/gnulib/import/extra/snippet/warn-on-use.h |  109 ++
 gdb/gnulib/import/extra/update-copyright      |  274 ++++++
 gdb/gnulib/import/inttypes.in.h               | 1130 ++++++++++++++++++++++++
 gdb/gnulib/import/m4/00gnulib.m4              |   30 +
 gdb/gnulib/import/m4/extensions.m4            |  123 +++
 gdb/gnulib/import/m4/gnulib-cache.m4          |   50 +
 gdb/gnulib/import/m4/gnulib-common.m4         |  372 ++++++++
 gdb/gnulib/import/m4/gnulib-comp.m4           |  266 ++++++
 gdb/gnulib/import/m4/gnulib-tool.m4           |   57 +
 gdb/gnulib/import/m4/include_next.m4          |  270 ++++++
 gdb/gnulib/import/m4/inttypes-pri.m4          |   42 +
 gdb/gnulib/import/m4/inttypes.m4              |  157 +++
 gdb/gnulib/import/m4/longlong.m4              |  113 ++
 gdb/gnulib/import/m4/memchr.m4                |   88 ++
 gdb/gnulib/import/m4/memmem.m4                |  145 +++
 gdb/gnulib/import/m4/mmap-anon.m4             |   55 +
 gdb/gnulib/import/m4/multiarch.m4             |   62 +
 gdb/gnulib/import/m4/onceonly.m4              |  104 ++
 gdb/gnulib/import/m4/stddef_h.m4              |   47 +
 gdb/gnulib/import/m4/stdint.m4                |  484 ++++++++++
 gdb/gnulib/import/m4/string_h.m4              |  120 +++
 gdb/gnulib/import/m4/warn-on-use.m4           |   47 +
 gdb/gnulib/import/m4/wchar_t.m4               |   24 +
 gdb/gnulib/import/memchr.c                    |  172 ++++
 gdb/gnulib/import/memchr.valgrind             |   14 
 gdb/gnulib/import/memmem.c                    |   75 ++
 gdb/gnulib/import/stddef.in.h                 |   86 ++
 gdb/gnulib/import/stdint.in.h                 |  619 +++++++++++++
 gdb/gnulib/import/str-two-way.h               |  452 ++++++++++
 gdb/gnulib/import/string.in.h                 | 1029 ++++++++++++++++++++++
 gdb/gnulib/inttypes.in.h                      | 1130 ------------------------
 gdb/gnulib/m4/00gnulib.m4                     |   30 -
 gdb/gnulib/m4/extensions.m4                   |  123 ---
 gdb/gnulib/m4/gnulib-cache.m4                 |   50 -
 gdb/gnulib/m4/gnulib-common.m4                |  372 --------
 gdb/gnulib/m4/gnulib-comp.m4                  |  266 ------
 gdb/gnulib/m4/gnulib-tool.m4                  |   57 -
 gdb/gnulib/m4/include_next.m4                 |  270 ------
 gdb/gnulib/m4/inttypes-pri.m4                 |   42 -
 gdb/gnulib/m4/inttypes.m4                     |  157 ---
 gdb/gnulib/m4/longlong.m4                     |  113 --
 gdb/gnulib/m4/memchr.m4                       |   88 --
 gdb/gnulib/m4/memmem.m4                       |  145 ---
 gdb/gnulib/m4/mmap-anon.m4                    |   55 -
 gdb/gnulib/m4/multiarch.m4                    |   62 -
 gdb/gnulib/m4/onceonly.m4                     |  104 --
 gdb/gnulib/m4/stddef_h.m4                     |   47 -
 gdb/gnulib/m4/stdint.m4                       |  484 ----------
 gdb/gnulib/m4/string_h.m4                     |  120 ---
 gdb/gnulib/m4/warn-on-use.m4                  |   47 -
 gdb/gnulib/m4/wchar_t.m4                      |   24 -
 gdb/gnulib/memchr.c                           |  172 ----
 gdb/gnulib/memchr.valgrind                    |   14 
 gdb/gnulib/memmem.c                           |   75 --
 gdb/gnulib/stddef.in.h                        |   86 --
 gdb/gnulib/stdint.in.h                        |  619 -------------
 gdb/gnulib/str-two-way.h                      |  452 ----------
 gdb/gnulib/string.in.h                        | 1029 ----------------------
 78 files changed, 8588 insertions(+), 8588 deletions(-)
 delete mode 100644 gdb/gnulib/Makefile.am
 delete mode 100644 gdb/gnulib/Makefile.in
 delete mode 100644 gdb/gnulib/dummy.c
 delete mode 100644 gdb/gnulib/extra/snippet/arg-nonnull.h
 delete mode 100644 gdb/gnulib/extra/snippet/c++defs.h
 delete mode 100644 gdb/gnulib/extra/snippet/warn-on-use.h
 delete mode 100755 gdb/gnulib/extra/update-copyright
 create mode 100644 gdb/gnulib/import/Makefile.am
 create mode 100644 gdb/gnulib/import/Makefile.in
 create mode 100644 gdb/gnulib/import/dummy.c
 create mode 100644 gdb/gnulib/import/extra/snippet/arg-nonnull.h
 create mode 100644 gdb/gnulib/import/extra/snippet/c++defs.h
 create mode 100644 gdb/gnulib/import/extra/snippet/warn-on-use.h
 create mode 100755 gdb/gnulib/import/extra/update-copyright
 create mode 100644 gdb/gnulib/import/inttypes.in.h
 create mode 100644 gdb/gnulib/import/m4/00gnulib.m4
 create mode 100644 gdb/gnulib/import/m4/extensions.m4
 create mode 100644 gdb/gnulib/import/m4/gnulib-cache.m4
 create mode 100644 gdb/gnulib/import/m4/gnulib-common.m4
 create mode 100644 gdb/gnulib/import/m4/gnulib-comp.m4
 create mode 100644 gdb/gnulib/import/m4/gnulib-tool.m4
 create mode 100644 gdb/gnulib/import/m4/include_next.m4
 create mode 100644 gdb/gnulib/import/m4/inttypes-pri.m4
 create mode 100644 gdb/gnulib/import/m4/inttypes.m4
 create mode 100644 gdb/gnulib/import/m4/longlong.m4
 create mode 100644 gdb/gnulib/import/m4/memchr.m4
 create mode 100644 gdb/gnulib/import/m4/memmem.m4
 create mode 100644 gdb/gnulib/import/m4/mmap-anon.m4
 create mode 100644 gdb/gnulib/import/m4/multiarch.m4
 create mode 100644 gdb/gnulib/import/m4/onceonly.m4
 create mode 100644 gdb/gnulib/import/m4/stddef_h.m4
 create mode 100644 gdb/gnulib/import/m4/stdint.m4
 create mode 100644 gdb/gnulib/import/m4/string_h.m4
 create mode 100644 gdb/gnulib/import/m4/warn-on-use.m4
 create mode 100644 gdb/gnulib/import/m4/wchar_t.m4
 create mode 100644 gdb/gnulib/import/memchr.c
 create mode 100644 gdb/gnulib/import/memchr.valgrind
 create mode 100644 gdb/gnulib/import/memmem.c
 create mode 100644 gdb/gnulib/import/stddef.in.h
 create mode 100644 gdb/gnulib/import/stdint.in.h
 create mode 100644 gdb/gnulib/import/str-two-way.h
 create mode 100644 gdb/gnulib/import/string.in.h
 delete mode 100644 gdb/gnulib/inttypes.in.h
 delete mode 100644 gdb/gnulib/m4/00gnulib.m4
 delete mode 100644 gdb/gnulib/m4/extensions.m4
 delete mode 100644 gdb/gnulib/m4/gnulib-cache.m4
 delete mode 100644 gdb/gnulib/m4/gnulib-common.m4
 delete mode 100644 gdb/gnulib/m4/gnulib-comp.m4
 delete mode 100644 gdb/gnulib/m4/gnulib-tool.m4
 delete mode 100644 gdb/gnulib/m4/include_next.m4
 delete mode 100644 gdb/gnulib/m4/inttypes-pri.m4
 delete mode 100644 gdb/gnulib/m4/inttypes.m4
 delete mode 100644 gdb/gnulib/m4/longlong.m4
 delete mode 100644 gdb/gnulib/m4/memchr.m4
 delete mode 100644 gdb/gnulib/m4/memmem.m4
 delete mode 100644 gdb/gnulib/m4/mmap-anon.m4
 delete mode 100644 gdb/gnulib/m4/multiarch.m4
 delete mode 100644 gdb/gnulib/m4/onceonly.m4
 delete mode 100644 gdb/gnulib/m4/stddef_h.m4
 delete mode 100644 gdb/gnulib/m4/stdint.m4
 delete mode 100644 gdb/gnulib/m4/string_h.m4
 delete mode 100644 gdb/gnulib/m4/warn-on-use.m4
 delete mode 100644 gdb/gnulib/m4/wchar_t.m4
 delete mode 100644 gdb/gnulib/memchr.c
 delete mode 100644 gdb/gnulib/memchr.valgrind
 delete mode 100644 gdb/gnulib/memmem.c
 delete mode 100644 gdb/gnulib/stddef.in.h
 delete mode 100644 gdb/gnulib/stdint.in.h
 delete mode 100644 gdb/gnulib/str-two-way.h
 delete mode 100644 gdb/gnulib/string.in.h

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 19e46a1..ed3e9f5 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -170,12 +170,12 @@ INTL_CFLAGS = @INCINTL@
 GDB_DATADIR = @GDB_DATADIR@
 
 # Helper code from gnulib.
-LIBGNU = gnulib/libgnu.a
-INCGNU = -I$(srcdir)/gnulib -Ignulib
+LIBGNU = gnulib/import/libgnu.a
+INCGNU = -I$(srcdir)/gnulib/import -Ignulib/import
 
 # Generated headers in the gnulib directory.  These must be listed
 # so that they are generated before other files are compiled.
-GNULIB_H = gnulib/string.h @GNULIB_STDINT_H@
+GNULIB_H = gnulib/import/string.h @GNULIB_STDINT_H@
 
 #
 # CLI sub directory definitons
@@ -916,13 +916,13 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 TSOBS = inflow.o
 
 SUBDIRS = doc @subdirs@ data-directory
-CLEANDIRS = $(SUBDIRS) gnulib 
+CLEANDIRS = $(SUBDIRS) gnulib/import
 
 # List of subdirectories in the build tree that must exist.
 # This is used to force build failures in existing trees when
 # a new directory is added.
 # The format here is for the `case' shell command.
-REQUIRED_SUBDIRS = doc | testsuite | gnulib | data-directory
+REQUIRED_SUBDIRS = doc | testsuite | gnulib/import | data-directory
 
 # For now, shortcut the "configure GDB for fewer languages" stuff.
 YYFILES = c-exp.c \
@@ -1162,8 +1162,8 @@ gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS)
 
 # Convenience rule to handle recursion.
 $(LIBGNU) $(GNULIB_H): all-lib
-all-lib: gnulib/Makefile
-	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=gnulib subdir_do
+all-lib: gnulib/import/Makefile
+	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=gnulib/import subdir_do
 .PHONY: all-lib
 
 # Convenience rule to handle recursion.
@@ -1273,8 +1273,8 @@ Makefile: Makefile.in config.status @frags@
 	  CONFIG_HEADERS= \
 	  $(SHELL) config.status
 
-gnulib/Makefile: gnulib/Makefile.in config.status @frags@
-	CONFIG_FILES="gnulib/Makefile" \
+gnulib/import/Makefile: gnulib/import/Makefile.in config.status @frags@
+	CONFIG_FILES="gnulib/import/Makefile" \
 	  CONFIG_COMMANDS="depfiles" \
 	  CONFIG_HEADERS= \
 	  CONFIG_LINKS= \
@@ -1302,31 +1302,31 @@ config.status: $(srcdir)/configure configure.tgt configure.host
 	$(SHELL) config.status --recheck
 
 ACLOCAL = aclocal
-ACLOCAL_AMFLAGS = -I gnulib/m4 -I ../config
+ACLOCAL_AMFLAGS = -I gnulib/import/m4 -I ../config
 aclocal_m4_deps = \
 	configure.ac \
-	gnulib/m4/00gnulib.m4 \
-	gnulib/m4/extensions.m4 \
-	gnulib/m4/gnulib-cache.m4 \
-	gnulib/m4/gnulib-common.m4 \
-	gnulib/m4/gnulib-comp.m4 \
-	gnulib/m4/gnulib-tool.m4 \
-	gnulib/m4/include_next.m4 \
-	gnulib/m4/inttypes.m4 \
-	gnulib/m4/inttypes-pri.m4 \
-	gnulib/m4/longlong.m4 \
-	gnulib/m4/memchr.m4 \
-	gnulib/m4/memmem.m4 \
-	gnulib/m4/mmap-anon.m4 \
-	gnulib/m4/multiarch.m4 \
-	gnulib/m4/onceonly.m4 \
-	gnulib/m4/stddef_h.m4 \
-	gnulib/m4/stdint.m4 \
-	gnulib/m4/string_h.m4 \
-	gnulib/m4/warn-on-use.m4 \
-	gnulib/m4/wchar_h.m4 \
-	gnulib/m4/wchar_t.m4 \
-	gnulib/m4/wint_t.m4 \
+	gnulib/import/m4/00gnulib.m4 \
+	gnulib/import/m4/extensions.m4 \
+	gnulib/import/m4/gnulib-cache.m4 \
+	gnulib/import/m4/gnulib-common.m4 \
+	gnulib/import/m4/gnulib-comp.m4 \
+	gnulib/import/m4/gnulib-tool.m4 \
+	gnulib/import/m4/include_next.m4 \
+	gnulib/import/m4/inttypes.m4 \
+	gnulib/import/m4/inttypes-pri.m4 \
+	gnulib/import/m4/longlong.m4 \
+	gnulib/import/m4/memchr.m4 \
+	gnulib/import/m4/memmem.m4 \
+	gnulib/import/m4/mmap-anon.m4 \
+	gnulib/import/m4/multiarch.m4 \
+	gnulib/import/m4/onceonly.m4 \
+	gnulib/import/m4/stddef_h.m4 \
+	gnulib/import/m4/stdint.m4 \
+	gnulib/import/m4/string_h.m4 \
+	gnulib/import/m4/warn-on-use.m4 \
+	gnulib/import/m4/wchar_h.m4 \
+	gnulib/import/m4/wchar_t.m4 \
+	gnulib/import/m4/wint_t.m4 \
 	../config/extensions.m4 \
 	../config/lead-dot.m4 \
 	../config/proginstall.m4 \
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 03cd666..2fa2519 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2242,7 +2242,7 @@ dnl  At the moment, we just assume it's UTF-8.
 AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
           [Define to be a string naming the default host character set.])
 
-AC_OUTPUT(Makefile gdb-gdb.gdb doc/Makefile gnulib/Makefile data-directory/Makefile,
+AC_OUTPUT(Makefile gdb-gdb.gdb doc/Makefile gnulib/import/Makefile data-directory/Makefile,
 [
 case x$CONFIG_HEADERS in
 xconfig.h:config.in)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 4f0ba19..cbeccef 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -76,20 +76,20 @@ ustlibs = @ustlibs@
 ustinc = @ustinc@
 
 # gnulib
-LIBGNU = gnulib/libgnu.a
-INCGNU = -I$(srcdir)/../gnulib -Ignulib
+LIBGNU = gnulib/import/libgnu.a
+INCGNU = -I$(srcdir)/../gnulib/import -Ignulib/import
 
 # We build gnulib directly under the gdbserver build directory, but
 # its sources don't live directly under gdbserver's source directory.
 # Tweak $srcdir and VPATH to make that work.
 GNULIB_FLAGS_TO_PASS = \
 	"top_srcdir=$(abs_top_srcdir)/.." \
-	"srcdir=$(abs_srcdir)/../gnulib" \
-	"VPATH=$(abs_top_srcdir)/../gnulib:$(abs_top_srcdir)"
+	"srcdir=$(abs_srcdir)/../gnulib/import" \
+	"VPATH=$(abs_top_srcdir)/../gnulib/import:$(abs_top_srcdir)"
 
 # Generated headers in the gnulib directory.  These must be listed
 # so that they are generated before other files are compiled.
-GNULIB_H = gnulib/string.h @GNULIB_STDINT_H@
+GNULIB_H = gnulib/import/string.h @GNULIB_STDINT_H@
 
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
@@ -216,7 +216,7 @@ generated_files = config.h $(GNULIB_H)
 	${CC} -c ${INTERNAL_CFLAGS} $<
 
 all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
 
 # Traditionally "install" depends on "all".  But it may be useful
 # not to; for example, if the user has made some trivial change to a
@@ -237,13 +237,13 @@ install-only:
 	$(INSTALL_PROGRAM) gdbserver$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT); \
 	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(man1dir); \
 	$(INSTALL_DATA) $(srcdir)/gdbserver.1 $(DESTDIR)$(man1dir)/$$n.1
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) install
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) install
 
 uninstall: force
 	n=`echo gdbserver | sed '$(program_transform_name)'`; \
 	if [ x$$n = x ]; then n=gdbserver; else true; fi; \
 	rm -f $(DESTDIR)/$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(man1dir)/$$n.1
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) uninstall
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) uninstall
 
 installcheck:
 check:
@@ -253,7 +253,7 @@ install-pdf:
 html:
 install-html:
 clean-info: force
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
 
 gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU)
 	rm -f gdbserver$(EXEEXT)
@@ -261,8 +261,8 @@ gdbserver$(EXEEXT): $(OBS) ${ADD_DEPS} ${CDEPS} $(LIBGNU)
 	$(LIBGNU) $(GDBSERVER_LIBS) $(XM_CLIBS)
 
 $(LIBGNU) $(GNULIB_H): all-lib
-all-lib: gnulib/Makefile
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
+all-lib: gnulib/import/Makefile
+	@cd gnulib/import/; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) all
 
 .PHONY: all-lib
 
@@ -320,11 +320,11 @@ clean:
 	rm -f i386-mmx.c i386-mmx-linux.c
 	rm -f x32.c x32-linux.c
 	rm -f x32-avx.c x32-avx-linux.c
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) clean
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) clean
 
 maintainer-clean realclean distclean: clean
 	rm -f nm.h tm.h xm.h config.h stamp-h config.log
-	@cd gnulib; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
+	@cd gnulib/import; $(MAKE) $(FLAGS_TO_PASS) $(GNULIB_FLAGS_TO_PASS) $@
 	rm -f Makefile config.status
 
 config.h: stamp-h ; @true
@@ -334,11 +334,11 @@ stamp-h: config.in config.status
 Makefile: Makefile.in config.status
 	CONFIG_HEADERS="" $(SHELL) ./config.status
 
-gnulib/Makefile: $(srcdir)/../gnulib/Makefile.in config.status
+gnulib/import/Makefile: $(srcdir)/../gnulib/import/Makefile.in config.status
 	  CONFIG_COMMANDS="depfiles" \
 	  CONFIG_HEADERS= \
 	  CONFIG_LINKS= \
-	  $(SHELL) config.status "gnulib/Makefile"
+	  $(SHELL) config.status "gnulib/import/Makefile"
 
 config.status: configure configure.srv
 	$(SHELL) ./config.status --recheck
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index 96a5f2d..ebbe571 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -450,7 +450,7 @@ if test x"$STDINT_H" != x; then
 fi
 AC_SUBST(GNULIB_STDINT_H)
 
-AC_OUTPUT(Makefile gnulib/Makefile:${srcdir}/../gnulib/Makefile.in,
+AC_OUTPUT(Makefile gnulib/import/Makefile:${srcdir}/../gnulib/import/Makefile.in,
 [case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > stamp-h ;;