aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Gilmore <gnu@cygnus>1993-01-31 00:41:47 +0000
committerJohn Gilmore <gnu@cygnus>1993-01-31 00:41:47 +0000
commitf980fcfbc67cf5c08d87698b8bc7f29094b0e819 (patch)
treef37bee883b5eec36eef5843188a214cd219e3c9e
parentbe4e1cd542caaa205942365101b29b5c7af0f60c (diff)
downloadgdb-f980fcfbc67cf5c08d87698b8bc7f29094b0e819.zip
gdb-f980fcfbc67cf5c08d87698b8bc7f29094b0e819.tar.gz
gdb-f980fcfbc67cf5c08d87698b8bc7f29094b0e819.tar.bz2
* Makefile.in (make-gdb.tar.Z): New location for texinfo.tex.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in13
2 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8574743..5e876be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 30 16:40:28 1993 John Gilmore (gnu@cygnus.com)
+
+ * Makefile.in (make-gdb.tar.Z): New location for texinfo.tex.
+
Thu Jan 28 15:09:59 1993 Ian Lance Taylor (ian@cygnus.com)
* test-build.mk (HOLES): Added tar, cpio and uudecode.
diff --git a/Makefile.in b/Makefile.in
index d9ff33f..68b18ff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,6 +76,10 @@ MAKEINFO = `if [ -f $${rootme}/texinfo/C/makeinfo ] ; \
then echo $${rootme}/texinfo/C/makeinfo ; \
else echo makeinfo ; fi`
+
+# libraries that may need to be augmented on a system-by-system basis
+X11_LIB = -lX11
+
# compilers to use to create programs which must be run in the build
# environment.
CC_FOR_BUILD = $(CC)
@@ -227,9 +231,11 @@ $(end-sanitize-chill)\
# Flags that are concerned with the location of the X11 include files
# and library files
+
X11_FLAGS_TO_PASS = \
"X11_INCLUDE_FLAGS=$(X11_INCLUDE_FLAGS)" \
- "X11_LIB_FLAGS=$(X11_LIB_FLAGS)"
+ "X11_LIB_FLAGS=$(X11_LIB_FLAGS)" \
+ "X11_LIB=$(X11_LIB)"
# Flags to pass down to makes which are built with the target
# environment (e.g. libg++, xiberty, newlib). -- keep these in alpha order please
@@ -1464,7 +1470,7 @@ gdb.tar.Z: setup-dirs
(cd gdb; $(MAKE) -f Makefile.in make-proto-gdb.dir)
$(MAKE) $(MFLAGS) -f Makefile.in make-gdb.tar.Z
-make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
+make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/texinfo.tex
rm -rf proto-toplev; mkdir proto-toplev
ln -s ../gdb/proto-gdb.dir proto-toplev/gdb
(cd proto-toplev; for i in $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS); do \
@@ -1490,8 +1496,7 @@ make-gdb.tar.Z: $(DEVO_SUPPORT) $(GDB_SUPPORT_DIRS) gdb texinfo/fsf/texinfo.tex
<Makefile.in >proto-toplev/Makefile.in
mkdir proto-toplev/texinfo
- mkdir proto-toplev/texinfo/fsf
- ln -s ../../../texinfo/fsf/texinfo.tex proto-toplev/texinfo/fsf/
+ ln -s ../../../texinfo/texinfo.tex proto-toplev/texinfo/
chmod og=u `find proto-toplev -print`
(VER=`sed <gdb/Makefile.in -n 's/VERSION = //p'`; \
echo "==> Making gdb-$$VER.tar.Z"; \