Kaynağa Gözat

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.
Guillem Jover 17 yıl önce
ebeveyn
işleme
e1f03a94a0
2 değiştirilmiş dosya ile 9 ekleme ve 13 silme
  1. 1 2
      utils/.gitignore
  2. 8 11
      utils/Makefile.am

+ 1 - 2
utils/.gitignore

@@ -1,3 +1,2 @@
 start-stop-daemon
 start-stop-daemon
-install-info
-install-info-stamp
+dpkg-install-info

+ 8 - 11
utils/Makefile.am

@@ -6,9 +6,10 @@ INCLUDES = \
 	-idirafter $(top_srcdir)/libcompat \
 	-idirafter $(top_srcdir)/libcompat \
 	-I$(top_srcdir)/lib
 	-I$(top_srcdir)/lib
 
 
+sbin_PROGRAMS =
 
 
 if WITH_START_STOP_DAEMON
 if WITH_START_STOP_DAEMON
-  sbin_PROGRAMS = start-stop-daemon
+  sbin_PROGRAMS += start-stop-daemon
 
 
   start_stop_daemon_SOURCES = \
   start_stop_daemon_SOURCES = \
 	start-stop-daemon.c
 	start-stop-daemon.c
@@ -16,16 +17,12 @@ if WITH_START_STOP_DAEMON
   start_stop_daemon_LDADD = ../libcompat/libcompat.a $(SSD_LIBS)
   start_stop_daemon_LDADD = ../libcompat/libcompat.a $(SSD_LIBS)
 endif
 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
 # 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)