#
#
# patch "INSTALL"
#  from [80a888d53227929e3820ac6d788fce811d177fc7]
#    to [91b324ecbcbac1631c53efa63e25abb53845d14c]
# 
# patch "Makefile.am"
#  from [ed7fa88d28e048f5415f34a938393975d00c9152]
#    to [d34b05ed64c6ec29d3efc631d196095fbf11c500]
#
============================================================
--- INSTALL	80a888d53227929e3820ac6d788fce811d177fc7
+++ INSTALL	91b324ecbcbac1631c53efa63e25abb53845d14c
@@ -176,14 +176,9 @@ 1. prerequisites:
 
            13. gettext
                $ cd /usr/src
-               $ tar zxf gettext-0.16.1.tar.gz
-               $ cd gettext-0.16.1
-               $ wget 'http://cvs.savannah.gnu.org/viewvc/gettext/gettext/gettext-runtime/intl/\
-                 localename.c?r1=1.15&r2=1.16&view=patch' -O localename_1.15-1.16.patch
-               $ cd gettext-runtime/intl
-               $ patch -p0 < ../../localename_1.15-1.16.patch
-               $ cd ../..
-               $ ./configure --prefix=/mingw
+               $ tar zxf gettext-0.17.tar.gz
+               $ cd gettext-0.17
+               $ ./configure --prefix=/usr/local
                $ make install
 
            14. If the wget command here fails, get the patch manually
@@ -236,9 +231,9 @@ 1. prerequisites:
                $ make install
 
             cd monotone
-            ./configure LUA_CFLAGS=-I/usr/local/include LUA_LIBS="-L/usr/local/lib -llua" \
-                        SQLITE3_CFLAGS=-I/usr/local/include SQLITE3_LIBS="-L/usr/local/lib -lsqlite3" \
-                        LIBIDN_CFLAGS=-I/usr/local/include LIBIDN_LIBS="-L/usr/local/lib -lidn"
+            ./configure lua_CFLAGS=-I/usr/local/include lua_LIBS="-L/usr/local/lib -llua" \
+                        sqlite_CFLAGS=-I/usr/local/include sqlite_LIBS="-L/usr/local/lib -lsqlite3" \
+                        idn_CFLAGS=-I/usr/local/include idn_LIBS="-L/usr/local/lib -lidn"
 
            # Notes
 
============================================================
--- Makefile.am	ed7fa88d28e048f5415f34a938393975d00c9152
+++ Makefile.am	d34b05ed64c6ec29d3efc631d196095fbf11c500
@@ -343,7 +343,7 @@ $(top_builddir)/figures/%.ps: $(srcdir)/
 # the user's LINGUAS env. variable.  Additional settings are in
 # po/Makevars.
 #
-# Only the foo.po-update target will overwrite a file in the source 
+# Only the foo.po-update target will overwrite a file in the source
 # po/ directory.
 
 include $(srcdir)/po/Makevars
@@ -380,7 +380,7 @@ if REBUILD_NLS
 %.gmo: %.merged.po
 	$(MSGFMT) -c --statistics -o $@ $<
 
-%.merged.po: $(srcdir)/po/%.po $(PACKAGE).pot 
+%.merged.po: $(srcdir)/po/%.po $(PACKAGE).pot
 	$(MSGMERGE) $^ -o $@
 
 # for translators' use
@@ -571,17 +571,17 @@ txt2c$(EXEEXT): txt2c.cc
 	$(CXX_FOR_BUILD) $(CXXFLAGS) -o $@ $<
 
 # FIXME: should use stamp files.
-%.cc: %.sql txt2c
+%.cc: %.sql txt2c$(EXEEXT)
 	./txt2c $(TXT2CFLAGS) --no-static $< $(*F) >address@hidden
 	cmp -s address@hidden $@ || mv -f address@hidden $@
 	rm -f address@hidden
 
-%.cc: %.lua txt2c
+%.cc: %.lua txt2c$(EXEEXT)
 	./txt2c $(TXT2CFLAGS) --no-static $< $(*F) >address@hidden
 	cmp -s address@hidden $@ || mv -f address@hidden $@
 	rm -f address@hidden
 
-%.cc: %.txt txt2c
+%.cc: %.txt txt2c$(EXEEXT)
 	./txt2c $(TXT2CFLAGS) --no-static $< $(*F) >address@hidden
 	cmp -s address@hidden $@ || mv -f address@hidden $@
 	rm -f address@hidden