gdb

* Makefile.in (SUBDIRS): Add doc.
	* configure: Rebuild.
	* configure.ac: Don't configure in doc.  Create doc/Makefile.
gdb/doc
	* Makefile.in (Makefile): Run ../config.status.
	(distclean): Update.
	* configure: Remove.
	* configure.ac: Remove.

gdb/ChangeLog

@@ -1,3 +1,9 @@
+2010-11-23  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.in (SUBDIRS): Add doc.
+	* configure: Rebuild.
+	* configure.ac: Don't configure in doc.  Create doc/Makefile.
+
 2010-11-23  Phil Muldoon  <pmuldoon@redhat.com>
 
         PR python/12212

gdb/Makefile.in

@@ -871,7 +871,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 
 TSOBS = inflow.o
 
-SUBDIRS = @subdirs@ data-directory
+SUBDIRS = doc @subdirs@ data-directory
 CLEANDIRS = $(SUBDIRS) gnulib
 
 # List of subdirectories in the build tree that must exist.

gdb/configure

@@ -989,7 +989,7 @@ CPP
 YACC
 YFLAGS
 XMKMF'
-ac_subdirs_all='doc testsuite
+ac_subdirs_all='testsuite
 gdbtk
 multi-ice
 gdbserver'
@@ -7883,7 +7883,7 @@ fi
 
 
 
-subdirs="$subdirs doc testsuite"
+subdirs="$subdirs testsuite"
 
 
 # Check whether to support alternative target configurations
@@ -15899,7 +15899,7 @@ ac_config_links="$ac_config_links $ac_config_links_1"
 $as_echo "#define GDB_DEFAULT_HOST_CHARSET \"UTF-8\"" >>confdefs.h
 
 
-ac_config_files="$ac_config_files Makefile .gdbinit:gdbinit.in gnulib/Makefile data-directory/Makefile"
+ac_config_files="$ac_config_files Makefile .gdbinit:gdbinit.in doc/Makefile gnulib/Makefile data-directory/Makefile"
 
 ac_config_commands="$ac_config_commands default"
 
@@ -16665,6 +16665,7 @@ do
     "$ac_config_links_1") CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     ".gdbinit") CONFIG_FILES="$CONFIG_FILES .gdbinit:gdbinit.in" ;;
+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "gnulib/Makefile") CONFIG_FILES="$CONFIG_FILES gnulib/Makefile" ;;
     "data-directory/Makefile") CONFIG_FILES="$CONFIG_FILES data-directory/Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;

gdb/configure.ac

@@ -108,7 +108,7 @@ AS_HELP_STRING([--with-relocated-sources=PATH], [automatically relocate this pat
               [Relocated directory for source files. ])
 ])
 
-AC_CONFIG_SUBDIRS(doc testsuite)
+AC_CONFIG_SUBDIRS(testsuite)
 
 # Check whether to support alternative target configurations
 AC_ARG_ENABLE(targets,
@@ -2148,7 +2148,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 .gdbinit:gdbinit.in gnulib/Makefile data-directory/Makefile,
+AC_OUTPUT(Makefile .gdbinit:gdbinit.in doc/Makefile gnulib/Makefile data-directory/Makefile,
 [
 case x$CONFIG_HEADERS in
 xconfig.h:config.in)

gdb/doc/ChangeLog

@@ -1,3 +1,10 @@
+2010-11-23  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.in (Makefile): Run ../config.status.
+	(distclean): Update.
+	* configure: Remove.
+	* configure.ac: Remove.
+
 2010-11-12  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.texinfo (Basic Python): Update.  Add xref.

gdb/doc/Makefile.in

@@ -515,8 +515,8 @@ annotate/index.html: $(ANNOTATE_DOC_FILES)
 
 force:
 
-Makefile: Makefile.in $(host_makefile_frag) config.status
-	$(SHELL) ./config.status
+Makefile: Makefile.in $(host_makefile_frag) ../config.status
+	cd .. && $(SHELL) ./config.status doc/Makefile
 
 
 # The "least clean" level of cleaning.  Get rid of files which are
@@ -534,7 +534,7 @@ clean: mostlyclean
 	rm -f gdb-cfg.texi
 
 distclean: clean
-	rm -f Makefile config.status config.log
+	rm -f Makefile
 
 # GDBvn.texi, the dvi files, the info files, and the postscript files, 
 # are all part of the distribution, so it should not be removed by

gdb/doc/configure.ac

@@ -1,9 +0,0 @@
-AC_PREREQ(2.59)
-AC_INIT(refcard.tex)
-sinclude(../../config/acx.m4)
-AC_PROG_INSTALL
-AC_PROG_LN_S
-
-ACX_PKGVERSION([GDB])
-ACX_BUGURL([http://www.gnu.org/software/gdb/bugs/])
-AC_OUTPUT(Makefile)