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

[Ryan Kavanagh]

[Ryan Kavanagh (ryanakca)]

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]

1485. By Ryan Kavanagh on 2013-03-01

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

[Ryan Kavanagh (ryanakca)]

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)

=== modified file 'configure.ac'
--- configure.ac	2011-12-30 12:14:08 +0000
+++ configure.ac	2013-03-01 01:01:21 +0000
@@ -86,6 +86,18 @@
       AC_MSG_WARN([*** DVI and PDF files will not be built.])
     fi ])
 
+# Find a install-info program. A failure is not fatal, only that info
+# files won't be properly installed
+AC_DEFUN([VM_PROG_INSTALLINFO],
+  [ AC_CHECK_PROG(INSTALL_INFO, ginstall-info, ginstall-info)
+    if test "x${INSTALL_INFO}" = "x" ; then
+      AC_CHECK_PROG(INSTALL_INFO, install-info, install-info)
+      if test "x{INSTALL_INFO}" = "x" ; then
+        AC_MSG_WARN([*** No install-info program found.])
+        AC_MSG_WARN([*** Info Dir file will not be updated.])
+      fi
+    fi ])
+
 # Choose an Emacs flavor according to the --with-emacs user option, or try
 # emacs and xemacs.
 # We use EMACS_PROG instead of EMACS to avoid colliding with Emacs' own
@@ -261,6 +273,7 @@
 VM_PROG_XARGS
 VM_PROG_GNU_TAR
 VM_PROG_MAKEINFO
+VM_PROG_INSTALLINFO
 VM_PROG_TEXI2DVI
 
 VM_PROG_EMACS

=== modified file 'info/Makefile.in'
--- info/Makefile.in	2011-12-30 15:24:10 +0000
+++ info/Makefile.in	2013-03-01 01:01:21 +0000
@@ -16,6 +16,7 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_INFO = @INSTALL_INFO@
 
 prefix = @prefix@
 srcdir = @srcdir@
@@ -54,7 +55,11 @@
           for i in `${LS} *.info* ` ; do                               \
 	    echo "Installing $$i in $(DESTDIR)$(infodir)" ;            \
             $(INSTALL_DATA) $$i "$(DESTDIR)$(infodir)" ;               \
-          done ;                                                       \
+	    if test "$(INSTALL_INFO)" ; then                           \
+	      $(INSTALL_INFO) "$(DESTDIR)$(infodir)"/$$i               \
+	                          "$(DESTDIR)$(infodir)"/dir ;         \
+	    fi ;                                                       \
+	  done ;                                                       \
         else                                                           \
           if test "x$(LINKPATH)" = "x" ; then                          \
             for i in `${LS} *.info* ` ; do                             \