Achim Gratz <[email protected]> wrote:
> From 11a243c4c01f5c2802328e3e4f7956abbaafd7e8 Mon Sep 17 00:00:00 2001
> From: Achim Gratz <[email protected]>
> Date: Sun, 10 Jul 2011 08:42:20 +0200
> Subject: [PATCH] remove Makefile target install-info-debian, modify
> install-info to be compatible
>
> * Makefile: remove target install-info-debian and modify target
> install-info so that it is compatible with the older dpkg version
> of install-info that resides in /usr/sbin and may be picked up
> when root is installing info files
>
> Initial reporting by Jude DaShiell, suggestions for changing Makefile
> by Nick Dokos. The solution implemented re-arranges the arguments to
> install-info to be compatible with both the dpkg and GNU version of
> the program. On Debian, /usr/bin/install-info is actually a wrapper
> that calls /usr/bin/ginstall-info and issues the following warning
> when called as root:
>
> This is not dpkg install-info anymore, but GNU install-info
> See the man page for ginstall-info for command line arguments
>
> This warning can be safely ignored since we actually prefer that GNU
> install-info is called even though we've arranged the arguments to
> be compatible with dpkg install-info.
>
> Tested on openSuSE Tumbleweed, Win7/Pro (both MSys and Cygwin) and by
> Jude DaShiell on Debian Squeeze and Slackware.
>
> TINYCHANGE
> ---
> Makefile | 3 ---
> doc/org.texi | 18 ++++++++++++------
> 2 files changed, 12 insertions(+), 9 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index fe833d7..eb2597f 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -222,9 +222,6 @@ install-lisp: $(LISPFILES) $(ELCFILES)
> install-info: $(INFOFILES)
> if [ ! -d $(infodir) ]; then $(MKDIR) $(infodir); else true; fi ;
> $(CP) $(INFOFILES) $(infodir)
> - $(INSTALL_INFO) --info-file=$(INFOFILES) --info-dir=$(infodir)
> -
> -install-info-debian: $(INFOFILES)
> $(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES)
>
> autoloads: lisp/org-install.el
> diff --git a/doc/org.texi b/doc/org.texi
> index 7f92382..c8ff8a0 100644
> --- a/doc/org.texi
> +++ b/doc/org.texi
> @@ -880,15 +880,21 @@ make install
> @end example
>
> Installing Info files is system dependent, because of differences in the
> -@file{install-info} program. In Debian it copies the info files into the
> -correct directory and modifies the info directory file. In many other
> -systems, the files need to be copied to the correct directory separately, and
> -@file{install-info} then only modifies the directory file. Check your system
> -documentation to find out which of the following commands you need:
> +@file{install-info} program. The following should correctly install the Info
> +files on most systems, please send a bug report if not@footnote{The output
> +from install-info (if any) is also system dependent. In particular Debian
> +and it's derivatives use two different versions of install-info and you may
^^^^
its
> +see the message:
> +
> +@example
> +This is not dpkg install-info anymore, but GNU install-info
> +See the man page for ginstall-info for command line arguments
> +@end example
> +
> +@noindent which can be safely ignored.}.
>
> @example
> make install-info
> -make install-info-debian
> @end example
>
> Then add the following line to @file{.emacs}. It is needed so that
> --
> 1.7.6
Looks good to me - tested on Ubuntu 10.10.
Thanks,
Nick
