This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[PATCH] More makefile/configure tweaks
- To: <gdb-patches at sources dot redhat dot com>
- Subject: [PATCH] More makefile/configure tweaks
- From: Keith Seitz <keiths at cygnus dot com>
- Date: Thu, 16 Aug 2001 15:46:57 -0700 (PDT)
Hi,
I hate to do this to people, but I need to make one more tweak to
configure.in and Makefile.in. Hopefully this will be the end of it.
Keith
ChangeLog
2001-08-16 Keith Seitz <keiths@redhat.com>
* configure.in (GDBTK_SRC_DIR): We must have autoconf
give us the absolute path to the source directory.
* configure: Regenerated.
* Makefile.in (GDBTK_SRC_DIR): Add variable so that
autoconf can substitue it in for us.
(gdbtk.o): Pass in GDBTK_SRC_DIR instead of srcdir. We
really do need an absolute pathname.
Patch
Index: configure.in
===================================================================
RCS file: /cvs/src/src/gdb/configure.in,v
retrieving revision 1.69
diff -u -p -r1.69 configure.in
--- configure.in 2001/07/30 22:08:41 1.69
+++ configure.in 2001/08/16 22:45:58
@@ -941,6 +941,13 @@ configdir="unix"
GDBTKLIBS=
if test "${enable_gdbtk}" = "yes"; then
+ # Gdbtk must have an absolute path to srcdir in order to run
+ # properly when not installed.
+ here=`pwd`
+ cd ${srcdir}
+ GDBTK_SRC_DIR=`pwd`
+ cd $here
+
CY_AC_PATH_TCLCONFIG
if test -z "${no_tcl}"; then
CY_AC_LOAD_TCLCONFIG
@@ -1080,6 +1087,7 @@ AC_SUBST(TIXLIB)
AC_SUBST(TIX_DEPS)
AC_SUBST(GDBTKLIBS)
AC_SUBST(GDBTK_CFLAGS)
+AC_SUBST(GDBTK_SRC_DIR)
AC_PATH_X
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.111
diff -u -p -r1.111 Makefile.in
--- Makefile.in 2001/08/15 21:09:46 1.111
+++ Makefile.in 2001/08/16 22:45:58
@@ -270,6 +270,10 @@ IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_
GDBTK_VERSION = 1.0
GDBTK_LIBRARY = $(datadir)/insight$(GDBTK_VERSION)
+# Gdbtk requires an absolute path to the source directory or
+# the testsuite won't run properly.
+GDBTK_SRC_DIR = @GDBTK_SRC_DIR@
+
SUBDIR_GDBTK_OBS = \
gdbtk.o gdbtk-bp.o gdbtk-cmds.o gdbtk-hooks.o \
gdbtk-register.o gdbtk-stack.o gdbtk-varobj.o gdbtk-wrapper.o
@@ -1395,7 +1399,7 @@ gdbtk.o: $(srcdir)/gdbtk/generic/gdbtk.c
$(ITK_CFLAGS) $(TIX_CFLAGS) \
$(TCL_CFLAGS) $(TK_CFLAGS) $(X11_CFLAGS) $(GDBTK_CFLAGS)\
$(srcdir)/gdbtk/generic/gdbtk.c \
- -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" -DSRC_DIR=\"$(srcdir)\"
+ -DGDBTK_LIBRARY=\"$(GDBTK_LIBRARY)\" -DSRC_DIR=\"$(GDBTK_SRC_DIR)\"
gdbtk-bp.o: $(srcdir)/gdbtk/generic/gdbtk-bp.c \
$(srcdir)/gdbtk/generic/gdbtk.h $(srcdir)/gdbtk/generic/gdbtk-cmds.h \