vm team mailing list archive

[Ryan Kavanagh <ryanakca@xxxxxxxxx>]

Ryan Kavanagh has proposed merging lp:~ryanakca/vm/vm-1136371 into lp:vm.

Requested reviews:
  VM development team (vm)
Related bugs:
  Bug #1136371 in VM: "install-info not called after installing info files"
  https://bugs.launchpad.net/vm/+bug/1136371

For more details, see:
https://code.launchpad.net/~ryanakca/vm/vm-1136371/+merge/151101
-- 
https://code.launchpad.net/~ryanakca/vm/vm-1136371/+merge/151101
Your team VM development team is requested to review the proposed merge of lp:~ryanakca/vm/vm-1136371 into lp:vm.

=== modified file 'configure.ac'
--- configure.ac	2011-12-30 12:14:08 +0000
+++ configure.ac	2013-02-28 21:16:20 +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-02-28 21:16:20 +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@
@@ -67,7 +68,11 @@
               $(LN_S) "$(LINKPATH)/texinfo/$$i" "$(DESTDIR)$(infodir)/$$i" ; \
             done ;                                                     \
           fi ;                                                         \
-        fi
+        fi ;
+	if test "$(INSTALL_INFO)" ; then			       \
+	  $(INSTALL_INFO) "$(DESTDIR)$(infodir)"/vm*.info              \
+	                          "$(DESTDIR)$(infodir)"dir ;          \
+	fi
 	@echo VM INFO files successfully installed\!
 
 uninstall-pkg: