Do not depend on any particular ordering of output.

[chaz/tar] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8174e0c34dd729bfdb8395a87b0b971385287623..0e813f3382c4e7ad2106a3c8879c87dcf3d225fa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,8 @@
 ## 02111-1307, USA.
 
 bin_PROGRAMS = tar
-libexec_PROGRAMS = @RMT@
+rmtdir=$(DEFAULT_RMT_DIR)
+rmt_PROGRAMS = @RMT@
 EXTRA_PROGRAMS = rmt
 
 noinst_HEADERS = arith.h common.h rmt.h system.h tar.h
@@ -40,7 +41,8 @@ tar_SOURCES = \
  sparse.c\
  system.c\
  tar.c\
- update.c
+ update.c\
+ utf8.c
 
 localedir = $(datadir)/locale
 INCLUDES = -I$(top_srcdir)/lib -I../lib 
@@ -48,6 +50,10 @@ INCLUDES = -I$(top_srcdir)/lib -I../lib
 DISTCLEANFILES = localedir.h
 localedir.h : Makefile
        echo '#define LOCALEDIR "$(localedir)"' >$@
+       echo "#ifndef DEFAULT_RMT_COMMAND" >> $@
+       echo "# define DEFAULT_RMT_COMMAND \"$(rmtdir)/`echo \"rmt\" | sed 's,^.*/,,;$(transform)'`$(EXEEXT)\"" >> $@
+       echo "#endif" >> $@
+
 rmt.o tar.o : localedir.h
 
 LDADD = ../lib/libtar.a $(LIBINTL)