* Makefile.in (LN_S): Define.

	(gdb-cfg.texi, gdb.dvi, links2roff, inc-hist.texinfo): Don't
	invoke "ln -s" unless it is known to work.

	* configure.in (AC_PROG_LN_S): Add.

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index fcc5050c6f80c18337703189ce604604430ce04c..89a4b0999d903cfd16296fff4a6681ace76dc6ab 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-16  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * Makefile.in (LN_S): Define.
+       (gdb-cfg.texi, gdb.dvi, links2roff, inc-hist.texinfo): Don't
+       invoke "ln -s" unless it is known to work.
+
+       * configure.in (AC_PROG_LN_S): Add.
+
 2000-04-14  Jim Blandy  <jimb@redhat.com>
 
        * gdbint.texinfo (Pointers Are Not Always Addresses): New manual

diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in
index 0b703a88c56e42c67c6b8fd685cd5c246328f95c..cef11bf69485505b6902cb6112c866b25d43c7ac 100644 (file)
--- a/gdb/doc/Makefile.in
+++ b/gdb/doc/Makefile.in
@@ -27,6 +27,8 @@ htmldir = $(prefix)/html
 
 SHELL = @SHELL@
 
+LN_S = @LN_S@
+
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
@@ -200,7 +202,8 @@ GDBvn.texi : ${gdbdir}/Makefile.in
 # not one for their binary config---which may not be specifically
 # defined anyways).
 gdb-cfg.texi: ${srcdir}/${DOC_CONFIG}-cfg.texi
-       ln -s ${srcdir}/${DOC_CONFIG}-cfg.texi gdb-cfg.texi || \
+       (test "$$LN_S" = "ln -s" && \
+         ln -s ${srcdir}/${DOC_CONFIG}-cfg.texi gdb-cfg.texi) || \
        ln ${srcdir}/${DOC_CONFIG}-cfg.texi gdb-cfg.texi || \
        cp ${srcdir}/${DOC_CONFIG}-cfg.texi gdb-cfg.texi
 
@@ -216,7 +219,7 @@ gdb-cfg.texi: ${srcdir}/${DOC_CONFIG}-cfg.texi
 # GDB MANUAL: TeX dvi file
 gdb.dvi: ${SFILES_DOC}
        if [ ! -f ./GDBvn.texi ]; then \
-               ln -s $(srcdir)/GDBvn.texi . || \
+               (test "$$LN_S" = "ln -s" && ln -s $(srcdir)/GDBvn.texi .) || \
                ln $(srcdir)/GDBvn.texi . || \
                cp $(srcdir)/GDBvn.texi . ; else true; fi
        $(SET_TEXINPUTS) $(TEX) gdb.texinfo
@@ -251,7 +254,7 @@ gdb.info: ${SFILES_DOC}
 # in main sourcedir.
 links2roff: $(SFILES_INCLUDED)
        if [ ! -f gdb.texinfo ]; then \
-               ln -s $(SFILES_INCLUDED) . || \
+               (test "$$LN_S" = "ln -s" && ln -s $(SFILES_INCLUDED) .) || \
                ln $(SFILES_INCLUDED)    . || \
                cp $(SFILES_INCLUDED)    . ; \
        fi
@@ -267,7 +270,8 @@ rluser.texinfo: ${READLINE_DIR}/rluser.texinfo
                ${READLINE_DIR}/rluser.texinfo > ./rluser.texinfo
 
 inc-hist.texinfo: ${READLINE_DIR}/inc-hist.texinfo
-       ln -s ${READLINE_DIR}/inc-hist.texinfo . || \
+       (test "$$LN_S" = "ln -s" && \
+        ln -s ${READLINE_DIR}/inc-hist.texinfo .) || \
        ln ${READLINE_DIR}/inc-hist.texinfo . || \
        cp ${READLINE_DIR}/inc-hist.texinfo .
 

diff --git a/gdb/doc/configure.in b/gdb/doc/configure.in
index 460efc2b466c93329fed355e773442b46893acbd..fee9eced522102054425290b63d7e240e5ce4d94 100644 (file)
--- a/gdb/doc/configure.in
+++ b/gdb/doc/configure.in
@@ -1,4 +1,5 @@
 AC_PREREQ(2.12.1)
 AC_INIT(refcard.tex)
 AC_PROG_INSTALL
+AC_PROG_LN_S
 AC_OUTPUT(Makefile)