* .gdbinit: Rename to gdbinit.in.

	* gdbinit.in: New file,
	* configure.in: Generate .gdbinit from gdbinit.in.
	* configure: Regenerated.
	* Makefile.in (distclean): Always remove .gdbinit.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39759 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d8181ef..abe8ba7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2001-02-16  Gerald Pfeifer  <pfeifer@dbai.tuwien.ac.at>
+
+       * .gdbinit: Rename to gdbinit.in.
+       * gdbinit.in: New file, 
+       * configure.in: Generate .gdbinit from gdbinit.in.
+       * configure: Regenerated.
+       * Makefile.in (distclean): Always remove .gdbinit.
+
 2001-02-16  Jakub Jelinek  <jakub@redhat.com>
 
        * objc/objc-act.c (start_class): Register implemented_classes with

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index a78183e..304fbd1 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2363,7 +2363,7 @@ distclean: clean $(INTL_DISTCLEAN) lang.distclean
        -rm -f testsuite/{gcc,g++}.{log,sum}
        -rm -f intl/libintl.h libintl.h
        -rm -f cxxmain.c splay-tree.c obstack.c alloca.c hashtab.c safe-ctype.c
-       -rm -f mklibgcc libgcc.map gccbug configargs.h
+       -rm -f mklibgcc libgcc.map gccbug .gdbinit configargs.h
        -rm -f gcov.pod
        -rm -f fixinc/Makefile
        -rmdir cp f java objc fixinc intl po 2>/dev/null

diff --git a/gcc/configure b/gcc/configure
index c6ab580..e30f265 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -6670,23 +6670,21 @@ do
        echo "lang.$t: $x" >> Make-hooks
 done
 
-# If we're not building in srcdir, create .gdbinit.
+# Create .gdbinit.
 
-if test ! -f Makefile.in; then
-       echo "dir ." > .gdbinit
-       echo "dir ${srcdir}" >> .gdbinit
-       if test x$gdb_needs_out_file_path = xyes
-       then
-               echo "dir ${srcdir}/config/"`dirname ${out_file}` >> .gdbinit
-       fi
-       if test "x$subdirs" != x; then
-               for s in $subdirs
-               do
-                       echo "dir ${srcdir}/$s" >> .gdbinit
-               done
-       fi
-       echo "source ${srcdir}/.gdbinit" >> .gdbinit
+echo "dir ." > .gdbinit
+echo "dir ${srcdir}" >> .gdbinit
+if test x$gdb_needs_out_file_path = xyes
+then
+       echo "dir ${srcdir}/config/"`dirname ${out_file}` >> .gdbinit
+fi
+if test "x$subdirs" != x; then
+       for s in $subdirs
+       do
+               echo "dir ${srcdir}/$s" >> .gdbinit
+       done
 fi
+echo "source ${srcdir}/gdbinit.in" >> .gdbinit
 
 # Define variables host_canonical and build_canonical
 # because some Cygnus local changes in the Makefile depend on them.

diff --git a/gcc/configure.in b/gcc/configure.in
index 5938792..26d9e1e 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1707,23 +1707,21 @@ do
        echo "lang.$t: $x" >> Make-hooks
 done
 
-# If we're not building in srcdir, create .gdbinit.
+# Create .gdbinit.
 
-if test ! -f Makefile.in; then
-       echo "dir ." > .gdbinit
-       echo "dir ${srcdir}" >> .gdbinit
-       if test x$gdb_needs_out_file_path = xyes
-       then
-               echo "dir ${srcdir}/config/"`dirname ${out_file}` >> .gdbinit
-       fi
-       if test "x$subdirs" != x; then
-               for s in $subdirs
-               do
-                       echo "dir ${srcdir}/$s" >> .gdbinit
-               done
-       fi
-       echo "source ${srcdir}/.gdbinit" >> .gdbinit
+echo "dir ." > .gdbinit
+echo "dir ${srcdir}" >> .gdbinit
+if test x$gdb_needs_out_file_path = xyes
+then
+       echo "dir ${srcdir}/config/"`dirname ${out_file}` >> .gdbinit
+fi
+if test "x$subdirs" != x; then
+       for s in $subdirs
+       do
+               echo "dir ${srcdir}/$s" >> .gdbinit
+       done
 fi
+echo "source ${srcdir}/gdbinit.in" >> .gdbinit
 
 # Define variables host_canonical and build_canonical
 # because some Cygnus local changes in the Makefile depend on them.

diff --git a/gcc/.gdbinit b/gcc/gdbinit.in
similarity index 100%
rename from gcc/.gdbinit
rename to gcc/gdbinit.in