From e1f03a94a08efb9de3736ff8b9c7c3fe24cda50e Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 17 Mar 2009 02:18:18 +0200
Subject: Use autoconf AC_ARG_PROGRAM support to rename install-info

Rename the binary on install to avoid colliding with autoconf's
install-info builtin targets.
---
 utils/.gitignore  |  3 +--
 utils/Makefile.am | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/utils/.gitignore b/utils/.gitignore
index 28a2697cf..93495c2ef 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -1,3 +1,2 @@
 start-stop-daemon
-install-info
-install-info-stamp
+dpkg-install-info
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 0e718e35d..33900ac29 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -6,9 +6,10 @@ INCLUDES = \
 	-idirafter $(top_srcdir)/libcompat \
 	-I$(top_srcdir)/lib
 
+sbin_PROGRAMS =
 
 if WITH_START_STOP_DAEMON
-  sbin_PROGRAMS = start-stop-daemon
+  sbin_PROGRAMS += start-stop-daemon
 
   start_stop_daemon_SOURCES = \
 	start-stop-daemon.c
@@ -16,16 +17,12 @@ if WITH_START_STOP_DAEMON
   start_stop_daemon_LDADD = ../libcompat/libcompat.a $(SSD_LIBS)
 endif
 
-EXTRA_DIST = install-info.c
-CLEANFILES = install-info install-info-stamp
+sbin_PROGRAMS += dpkg-install-info
 
 # Automake has its own install-info rule, gah
-all-local: install-info-stamp
-install-info-stamp: $(srcdir)/install-info.c
-	$(CC) $(CFLAGS) -o install-info $(srcdir)/install-info.c
-	touch $@
-
-install-exec-local: install-info-stamp
-	$(mkdir_p) $(DESTDIR)$(sbindir)
-	$(INSTALL_PROGRAM) install-info $(DESTDIR)$(sbindir)
+dpkg_install_info_SOURCES = install-info.c
+
+dpkg_install_info_LDADD = ../libcompat/libcompat.a
+
+transform = s/dpkg-install-info/install-info/; $(program_transform_name)
 
-- 
cgit v1.2.3