all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Achim Gratz <Stromeko@nexgo.de>
To: emacs-orgmode@gnu.org
Subject: Re: [PATCH] was: patch makefile solve a couple debian build problems and a slackware build problem
Date: Mon, 11 Jul 2011 22:01:24 +0200	[thread overview]
Message-ID: <87ipr8ziwb.fsf_-_@Rainer.invalid> (raw)
In-Reply-To: 87k4bqwkyw.fsf@gnu.org

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

Bastien <bzg@altern.org> writes:
> Achim and Nick, can I safely apply your patch or was it still a beta
> version?

I've reworked my patch to include a changelog and correct documentation.
Additionally I've now tested it on Windows, both with Cygwin and Msys.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-remove-Makefile-target-install-info-debian-modify-in.patch --]
[-- Type: text/x-patch, Size: 3148 bytes --]

From 11a243c4c01f5c2802328e3e4f7956abbaafd7e8 Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
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
+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


[-- Attachment #3: Type: text/plain, Size: 184 bytes --]




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

SD adaptation for Waldorf rackAttack V1.04R1:
http://Synth.Stromeko.net/Downloads.html#WaldorfSDada

  parent reply	other threads:[~2011-07-11 20:01 UTC|newest]

Thread overview: 72+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-10  9:10 patch makefile solve a couple debian build problems and a slackware build problem Jude DaShiell
2011-07-10  9:20 ` Bastien
2011-07-10 10:07   ` Achim Gratz
2011-07-10 12:55     ` Achim Gratz
2011-07-10 20:03       ` Achim Gratz
2011-07-11 12:01         ` Bastien
2011-07-11 16:00           ` Achim Gratz
2011-07-11 18:53             ` Bastien
2011-07-13 16:08               ` Makefile restructuring Achim Gratz
2011-07-16 11:54                 ` Bastien
2011-07-16 14:56                   ` Achim Gratz
2011-07-16 21:17                     ` Achim Gratz
2011-07-17 17:30                     ` Achim Gratz
2011-12-16  9:59                     ` Achim Gratz
2011-07-19 18:28                 ` Achim Gratz
2011-10-28 10:00                   ` Achim Gratz
2011-10-29 11:22                     ` Michael Brand
2011-10-30  7:33                       ` Achim Gratz
2011-10-30 14:20                         ` Michael Brand
2011-11-06 19:06                         ` Achim Gratz
2011-11-06 19:18                           ` Jambunathan K
2011-11-06 19:38                             ` Achim Gratz
2011-11-06 20:25                               ` Jambunathan K
2011-11-08 21:35                                 ` Achim Gratz
2011-11-13 12:47                                   ` Achim Gratz
2011-11-08 18:00                   ` Achim Gratz
2011-11-08 21:23                     ` Achim Gratz
2012-04-21 10:39                       ` Bastien
2012-04-21 11:40                         ` suvayu ali
2012-04-21 13:08                         ` Samuel Wales
2012-04-21 13:26                           ` Achim Gratz
2012-04-21 13:49                             ` Samuel Wales
2012-04-21 14:34                               ` Achim Gratz
2012-04-21 15:41                                 ` Samuel Wales
2012-04-21 15:44                                   ` Achim Gratz
2012-04-22 15:22                                 ` suvayu ali
2012-04-22 15:34                                   ` Achim Gratz
2012-04-23  7:32                                     ` suvayu ali
2012-04-24  1:46                                     ` Mike McLean
2012-04-24  4:55                                       ` Achim Gratz
2012-04-21 15:29                               ` Achim Gratz
2012-04-21 15:43                                 ` Bastien
2012-04-21 18:50                                 ` Samuel Wales
2012-04-21 18:55                                   ` Achim Gratz
2012-04-21 19:12                                     ` Samuel Wales
2012-04-21 19:17                                       ` Achim Gratz
2012-04-21 20:47                                         ` Samuel Wales
2012-04-22  6:34                                           ` Achim Gratz
2012-04-22 15:31                                             ` Samuel Wales
2012-04-22 15:42                                               ` Achim Gratz
2012-04-21 13:37                           ` Jambunathan K
2012-04-21 14:25                         ` François Allisson
2012-04-21 17:57                           ` Martyn Jago
2012-04-21 18:30                             ` Achim Gratz
2012-04-21 20:45                               ` François Allisson
2012-04-21 20:57                                 ` Samuel Wales
2012-04-21 23:27                               ` Martyn Jago
2012-04-23  5:05                         ` Achim Gratz
2012-04-25 18:00                         ` Achim Gratz
2012-04-26  6:55                           ` Bastien
2011-07-11 11:58     ` patch makefile solve a couple debian build problems and a slackware build problem Bastien
2011-07-11 15:39       ` Achim Gratz
2011-07-11 18:52         ` Bastien
2011-07-10 12:21   ` Nick Dokos
2011-07-10 12:49     ` Achim Gratz
2011-07-10 14:02       ` Jude DaShiell
2011-07-11 20:01   ` Achim Gratz [this message]
2011-07-11 21:40     ` [PATCH] was: " Nick Dokos
2011-07-11 22:19       ` Bastien
2011-07-13 15:45       ` Achim Gratz
2011-07-14 15:51         ` Bastien
2011-07-11 22:19     ` Bastien

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87ipr8ziwb.fsf_-_@Rainer.invalid \
    --to=stromeko@nexgo.de \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.