VM

Merge lp:~ryanakca/vm/vm-1136371 into lp:vm

Proposed by Ryan Kavanagh on 2013-02-28
Status: Needs review
Proposed branch: lp:~ryanakca/vm/vm-1136371
Merge into: lp:vm
Diff against target: 55 lines (+19/-1)
2 files modified
configure.ac (+13/-0)
info/Makefile.in (+6/-1)
To merge this branch: bzr merge lp:~ryanakca/vm/vm-1136371
Reviewer Review Type Date Requested Status
VM development team 2013-02-28 Pending
Review via email: mp+151101@code.launchpad.net
To post a comment you must log in.
Ryan Kavanagh (ryanakca) wrote :

Sorry, I forgot a backslash on line 48, breaking with style, but the updated target still runs. I can create a new merge request with the backslash if you'd like.

lp:~ryanakca/vm/vm-1136371 updated on 2013-03-01
1485. By Ryan Kavanagh on 2013-03-01

Call install-info after installing info files (LP: #1136371)

Ryan Kavanagh (ryanakca) wrote :

Please use the current (just pushed) revision as the initial one was incorrect in a few ways.

Unmerged revisions

1485. By Ryan Kavanagh on 2013-03-01

Call install-info after installing info files (LP: #1136371)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-12-30 12:14:08 +0000
3+++ configure.ac 2013-03-01 01:01:21 +0000
4@@ -86,6 +86,18 @@
5 AC_MSG_WARN([*** DVI and PDF files will not be built.])
6 fi ])
7
8+# Find a install-info program. A failure is not fatal, only that info
9+# files won't be properly installed
10+AC_DEFUN([VM_PROG_INSTALLINFO],
11+ [ AC_CHECK_PROG(INSTALL_INFO, ginstall-info, ginstall-info)
12+ if test "x${INSTALL_INFO}" = "x" ; then
13+ AC_CHECK_PROG(INSTALL_INFO, install-info, install-info)
14+ if test "x{INSTALL_INFO}" = "x" ; then
15+ AC_MSG_WARN([*** No install-info program found.])
16+ AC_MSG_WARN([*** Info Dir file will not be updated.])
17+ fi
18+ fi ])
19+
20 # Choose an Emacs flavor according to the --with-emacs user option, or try
21 # emacs and xemacs.
22 # We use EMACS_PROG instead of EMACS to avoid colliding with Emacs' own
23@@ -261,6 +273,7 @@
24 VM_PROG_XARGS
25 VM_PROG_GNU_TAR
26 VM_PROG_MAKEINFO
27+VM_PROG_INSTALLINFO
28 VM_PROG_TEXI2DVI
29
30 VM_PROG_EMACS
31
32=== modified file 'info/Makefile.in'
33--- info/Makefile.in 2011-12-30 15:24:10 +0000
34+++ info/Makefile.in 2013-03-01 01:01:21 +0000
35@@ -16,6 +16,7 @@
36 INSTALL_PROGRAM = @INSTALL_PROGRAM@
37 INSTALL_SCRIPT = @INSTALL_SCRIPT@
38 INSTALL_DATA = @INSTALL_DATA@
39+INSTALL_INFO = @INSTALL_INFO@
40
41 prefix = @prefix@
42 srcdir = @srcdir@
43@@ -54,7 +55,11 @@
44 for i in `${LS} *.info* ` ; do \
45 echo "Installing $$i in $(DESTDIR)$(infodir)" ; \
46 $(INSTALL_DATA) $$i "$(DESTDIR)$(infodir)" ; \
47- done ; \
48+ if test "$(INSTALL_INFO)" ; then \
49+ $(INSTALL_INFO) "$(DESTDIR)$(infodir)"/$$i \
50+ "$(DESTDIR)$(infodir)"/dir ; \
51+ fi ; \
52+ done ; \
53 else \
54 if test "x$(LINKPATH)" = "x" ; then \
55 for i in `${LS} *.info* ` ; do \

Subscribers

People subscribed via source and target branches

to all changes: