Re: [O] patch org-mode Makefile - solve a couple debian build problems and a slackware build problem

[Achim Gratz]

Hi Jude, 

Jude DaShiell <address@hidden> writes:
> If a make is done on debian squeeze with default org-mode install-info 
> which is debian's version of install-info complains that it's not gnu 
> info and tells you to use ginstall-info when a make install-info-debian 
> or make install-info is tried and neither one of those switches for make 
> upgrades the info documentation.

If it tells you that it is GNU info, then you've actually called
/usr/bin/install-info and it should — aside from this message — work:
what did you set $infodir to?  Does this directory exist and have the
new info files been copied into it (there may be old files still there,
so please check the date)?

Anyway, from the man pages it looks like this patch should remove the
incompatibility between dpkg install-info and GNU install-info on Debian
and not change anything for others.

>From a2399077495e716d0dd1faa3d491a379d2015065 Mon Sep 17 00:00:00 2001
From: Achim Gratz <address@hidden>
Date: Sun, 10 Jul 2011 08:42:20 +0200
Subject: [PATCH] possible solution for Debian install-info charade

---
 Makefile |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index a09ed83..a2940b0 100644
--- a/Makefile
+++ b/Makefile
@@ -221,9 +221,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
-- 
1.7.6

You will still get the warning about the two install-info versions on
Debian if you call it through their wrapper script, but based on my
(limited) testing it should work with all versions of install-info if
the rest of the setup is OK.

Can you please test this?


Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Wavetables for the Terratec KOMPLEXER:
http://Synth.Stromeko.net/Downloads.html#KomplexerWaves