# 
# 
# rename "monotone.1"
#     to "mtn.1"
# 
# patch "ChangeLog"
#  from [c52fbce5ee9787344d137305a8a6d8f6ac8a706d]
#    to [1372e5441be2306ffbb2a5d802d2779568526622]
# 
# patch "Makefile.am"
#  from [a3481fde5e09006a7b9d86ce007f7a214cbb40ad]
#    to [4b1b920f55c373743b4ae2185742e5bd484a75d9]
# 
============================================================
--- ChangeLog	c52fbce5ee9787344d137305a8a6d8f6ac8a706d
+++ ChangeLog	1372e5441be2306ffbb2a5d802d2779568526622
@@ -1,5 +1,11 @@
 2006-03-28  Nathaniel Smith  <address@hidden>
 
+	* Makefile.am: Build "mtn", not "monotone".
+	* monotone.1: Rename to...
+	* mtn.1: ...this.
+
+2006-03-28  Nathaniel Smith  <address@hidden>
+
 	* tests/*_MT*: Rename to reflect that they now test _MTN, not MT.
 	* testsuite.at: Update accordingly.
 
============================================================
--- Makefile.am	a3481fde5e09006a7b9d86ce007f7a214cbb40ad
+++ Makefile.am	4b1b920f55c373743b4ae2185742e5bd484a75d9
@@ -222,12 +222,12 @@
 
 # primaries
 
-bin_PROGRAMS = monotone
+bin_PROGRAMS = mtn
 check_PROGRAMS = unit_tests
 noinst_PROGRAMS = txt2c 
 EXTRA_PROGRAMS = usher 
 
-monotone_SOURCES = $(MOST_SOURCES) monotone.cc main.cc
+mtn_SOURCES = $(MOST_SOURCES) monotone.cc main.cc
 usher_SOURCES = contrib/usher.cc
 unit_tests_SOURCES = $(MOST_SOURCES) unit_tests.cc crypto_tests.cc
 
@@ -284,10 +284,10 @@
 lib3rdparty_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS)
 lib3rdparty_a_CXXFLAGS = $(AM_CXXFLAGS) $(LIB3RDPARTY_CXXFLAGS)
 
-monotone_LDFLAGS = 
-monotone_CPPFLAGS = -I$(top_srcdir)/lua -I$(top_srcdir)/sqlite
-monotone_CFLAGS = $(AM_CFLAGS) $(MONOTONE_CFLAGS)
-monotone_CXXFLAGS = $(AM_CXXFLAGS) $(PCH_FLAGS) $(MONOTONE_CXXFLAGS)
+mtn_LDFLAGS = 
+mtn_CPPFLAGS = -I$(top_srcdir)/lua -I$(top_srcdir)/sqlite
+mtn_CFLAGS = $(AM_CFLAGS) $(MTN_CFLAGS)
+mtn_CXXFLAGS = $(AM_CXXFLAGS) $(PCH_FLAGS) $(MTN_CXXFLAGS)
 
 unit_tests_LDFLAGS = 
 unit_tests_CPPFLAGS = -DBUILD_UNIT_TESTS -I$(top_srcdir)/lua -I$(top_srcdir)/sqlite
@@ -299,20 +299,20 @@
   BOOSTLIBS = @BOOST_LIBDIR@/libboost_filesystem$(BOOST_SUFFIX).a \
               @BOOST_LIBDIR@/libboost_date_time$(BOOST_SUFFIX).a \
               @BOOST_LIBDIR@/libboost_regex$(BOOST_SUFFIX).a
-  monotone_LDADD = lib3rdparty.a $(BOOSTLIBS)
+  mtn_LDADD = lib3rdparty.a $(BOOSTLIBS)
   unit_tests_LDADD = lib3rdparty.a $(BOOSTLIBS) \
                      @BOOST_LIBDIR@/libboost_unit_test_framework$(BOOST_SUFFIX).a
 else
-  monotone_LDADD = lib3rdparty.a
+  mtn_LDADD = lib3rdparty.a
   unit_tests_LDADD = lib3rdparty.a -lboost_unit_test_framework$(BOOST_SUFFIX)
 endif
 
-monotone_LDADD += libplatform.a $(LIBICONV) $(LIBINTL)
+mtn_LDADD += libplatform.a $(LIBICONV) $(LIBINTL)
 unit_tests_LDADD += libplatform.a $(LIBICONV) $(LIBINTL)
 
 if WIN32_PLATFORM
   libplatform_a_SOURCES += $(WIN32_PLATFORM_SOURCES)
-  monotone_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi
+  mtn_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi
   unit_tests_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi
   lib3rdparty_a_CPPFLAGS += -DWIN32 -DBOTAN_EXT_ENTROPY_SRC_CAPI -DBOTAN_EXT_ENTROPY_SRC_WIN32
   lib3rdparty_a_SOURCES += botan/es_capi.cpp botan/es_win32.cpp
@@ -363,7 +363,7 @@
 PNG_FIGURES=$(addprefix $(top_builddir)/figures/,$(notdir $(PDF_FIGURES:.pdf=.png)))
 EPS_FIGURES=$(addprefix $(top_builddir)/figures/,$(notdir $(PDF_FIGURES:.pdf=.eps)))
 
-man1_MANS = monotone.1
+man1_MANS = mtn.1
 info_TEXINFOS = monotone.texi
 EXTRA_DIST = $(man1_MANS) \
 	     $(PDF_FIGURES) \
@@ -513,8 +513,8 @@
 .PHONY: package_full_revision.txt apidocs
 package_full_revision.txt:
 	REAL_BLDDIR=$$PWD/$(top_builddir); \
-	(cd $(srcdir) && $$REAL_BLDDIR/monotone status) 2>/dev/null >$@ \
-	|| (cd $(srcdir) && monotone status) 2>/dev/null >$@ \
+	(cd $(srcdir) && $$REAL_BLDDIR/mtn status) 2>/dev/null >$@ \
+	|| (cd $(srcdir) && mtn status) 2>/dev/null >$@ \
 	|| (cp $(srcdir)/package_full_revision_dist.txt 2>/dev/null $@) \
 	|| (echo "unknown" >$@)
 package_full_revision_dist.txt: package_full_revision.txt