about summary refs log tree commit diff
path: root/manual
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-06-05 20:59:11 +0000
committerUlrich Drepper <drepper@redhat.com>1998-06-05 20:59:11 +0000
commit737547be99fd9afffbdf3f7ac817da0a06fffc9e (patch)
tree1f4b745192aafdaeb4af2cbefb7cab325ac6e7ac /manual
parentc6bd526f49f11784f7c1d2f694538981fa573ca1 (diff)
downloadglibc-737547be99fd9afffbdf3f7ac817da0a06fffc9e.tar.gz
glibc-737547be99fd9afffbdf3f7ac817da0a06fffc9e.tar.xz
glibc-737547be99fd9afffbdf3f7ac817da0a06fffc9e.zip
Update.
1998-06-05  Ulrich Drepper  <drepper@cygnus.com>

	* sunrpc/xdr_rec.c (xdrrec_create): Add cast for *_ops array since
	we cannot declare the struct element as const.
	* sunrpc/xdr_mem.c (xdrmem_create): Likewise.
	* sunrpc/xdr_stdio.c (xdrstdio_create): Likewise.

1998-06-04  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* manual/Makefile: Include ../Makeconfig earlier.
	(MAKEINFO, TEXI2DVI): Use defaults if ../Makeconfig does not
	exist.
	(dir-add.texinfo): Remove useless $(SHELL).

1998-06-04  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* Makefile (others): Build programs from install-bin.
	* configure.in: Modify config.make only if is was just created and
	move that command to second argument of AC_OUTPUT.  Add command to
	set config_vars in config.status.

1998-06-04  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* malloc/Makefile (address-width): Fix conditional.
Diffstat (limited to 'manual')
-rw-r--r--manual/Makefile17
1 files changed, 10 insertions, 7 deletions
diff --git a/manual/Makefile b/manual/Makefile
index 0a71d18c3a..c5ca263537 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -28,14 +28,17 @@ INSTALL_INFO = install-info
 all: dvi
 dvi: libc.dvi
 
-ifneq ($(strip $(MAKEINFO)),)
-all: info
-info: libc.info dir-add.info
-endif
-
 # Get glibc's configuration info.
 ifneq (,$(wildcard ../Makeconfig))
 include ../Makeconfig
+else
+MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
+endif
+
+ifneq ($(strip $(MAKEINFO)),)
+all: info
+info: libc.info dir-add.info
 endif
 
 # Set chapters and chapters-incl[12].
@@ -91,10 +94,10 @@ stamp-summary: summary.awk $(chapters) $(chapters-incl)
 # access to the documentation of the function, variables, and other
 # definitions.
 dir-add.texinfo: xtract-typefun.awk $(chapters) $(chapters-incl)
-	$(SHELL) -c '(echo "@dircategory GNU C library functions";	\
+	(echo "@dircategory GNU C library functions";			\
 	 echo "@direntry";						\
 	 $(AWK) -f $^;							\
-	 echo "@end direntry";)' > $@.new
+	 echo "@end direntry") > $@.new
 	mv -f $@.new $@
 
 # Generate Texinfo files from the C source for the example programs.