Use new backquote syntax.

[bpt/emacs.git] / lispref / Makefile.in

diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index 5047f35..b32652a 100644 (file)
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -8,25 +8,18 @@
 TEX=tex
 MAKE=make
 SHELL=/bin/sh
+INSTALL_INFO = install-info
 
 # Where the TeX macros are kept:
 texmacrodir = /usr/local/lib/tex/macros
 
-# Where the Emacs hierarchy lives ($EMACS in the INSTALL document for Emacs.)
-# For example: 
-# emacslibdir = /usr/local/gnu/lib/emacs
-
-# Directory where Emacs is installed, by default:
-emacslibdir = /usr/local/emacs
-
-# Unless you have a nonstandard Emacs installation, these shouldn't have to 
-# be changed.
-prefix = /usr/local
-infodir = ${prefix}/info
+# Standard configure variables.
+prefix = @prefix@
+infodir = @infodir@
 
 # The name of the manual:
 
-VERSION=2.5
+VERSION=2.6
 manual = elisp-manual-20-$(VERSION)
 
 # Uncomment this line for permuted index.
@@ -38,7 +31,7 @@ srcs = elisp.texi back.texi \
   abbrevs.texi advice.texi anti.texi backups.texi locals.texi buffers.texi \
   calendar.texi commands.texi compile.texi control.texi customize.texi \
   debugging.texi display.texi edebug.texi errors.texi eval.texi files.texi \
-  frames.texi functions.texi help.texi hooks.texi \
+  frames.texi functions.texi hash.texi help.texi hooks.texi \
   internals.texi intro.texi keymaps.texi lists.texi \
   loading.texi macros.texi maps.texi markers.texi \
   minibuf.texi modes.texi nonascii.texi numbers.texi objects.texi \
@@ -56,7 +49,7 @@ elisp: $(srcs) index.texi
        rm -f elisp-*
        makeinfo elisp.texi
 
-elisp.dvi: $(srcs) index.texi elisp.tps texindex
+elisp.dvi: $(srcs) index.texi
        # Avoid losing old contents of aux file entirely.
        -mv elisp.aux elisp.oaux
        # First shot to define xrefs:
@@ -65,26 +58,24 @@ elisp.dvi: $(srcs) index.texi elisp.tps texindex
        then \
          ./permute-index; \
          mv permuted.fns elisp.fns; \
+         texindex elisp.tp; \
        else \
-         ./texindex elisp.??; \
+         texindex elisp.??; \
        fi
        $(TEX) elisp.texi
 
-elisp.tps: texindex
-       ./texindex elisp.tp
-
 index.texi:
        if [ a${permuted_index} != a ]; \
        then \
-         ln -s index.perm index.texi; \
+         ln -s index.perm index.texi || ln index.perm index.texi; \
        else \
-         ln -s index.unperm index.texi; \
+         ln -s index.unperm index.texi || ln index.unperm index.texi; \
        fi
 
 install: elisp
        ./mkinstalldirs $(infodir)
        cp elisp elisp-* $(infodir)
-       @echo also add the line for elisp to $(infodir)/dir.
+       ${INSTALL_INFO} --dir-file=${infodir}/dir --info-file=${infodir}/elisp
 
 installall: install
        install -c texinfo.tex $(texmacrodir)
@@ -102,8 +93,9 @@ dist:
        -rm -rf temp
        -mkdir temp
        -mkdir temp/$(manual)
-       -ln README Makefile permute-index $(srcs) texinfo.tex \
-   elisp.dvi elisp.aux elisp.??s elisp elisp-[0-9] elisp-[0-9][0-9] temp/$(manual)
+       -ln README configure.in configure Makefile.in permute-index $(srcs) \
+ texinfo.tex elisp.dvi elisp.aux elisp.??s elisp elisp-[0-9] elisp-[0-9][0-9] \
+ temp/$(manual)
        -(cd temp/$(manual); rm -f mkinstalldirs)
        cp mkinstalldirs temp/$(manual)
        (cd temp/$(manual); rm -f *~)