From 477a60bb4f65890398f761fb81aa8952e214d1a2 Mon Sep 17 00:00:00 2001
From: Miguel de Icaza <miguel@novell.com>
Date: Wed, 7 Jul 1999 01:13:05 +0000
Subject: [PATCH] Horrible fix for Horrible m4 brokeness of gettext macros

---
 Make.common.in |  2 +-
 Makefile.in    |  1 +
 configure.in   | 10 +++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Make.common.in b/Make.common.in
index 2cecafb75..2510d2116 100644
--- a/Make.common.in
+++ b/Make.common.in
@@ -79,7 +79,7 @@ vfsdir      = $(rootdir)/vfs
 xvdir       = $(rootdir)/xv
 tkdir	    = $(rootdir)/tk
 gnomedir    = $(rootdir)/gnome
-icodir      = $(rootdir)/icons
+icondir      = $(rootdir)/icons
 
 hpath = -I$(mcsrcdir) -I$(slangdir) -I$(vfsdir) -I$(xvdir) -I$(xvdir)/support/xview_private -I$(tkdir)
 
diff --git a/Makefile.in b/Makefile.in
index 4d8d55553..46245d26c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,6 +109,7 @@ distcopy:
 	for I in $(alldirs); do \
 	    mkdir ../mc-$(VERSION)/$$I; \
 	    cd $$I ; \
+	    echo Processing $$I; \
 	    $(MAKE) distcopy VERSION=$(VERSION) PACKAGE=mc || exit 1; \
 	    cd ..; done
 	mkdir ../mc-$(VERSION)/macros
diff --git a/configure.in b/configure.in
index 9814a3e07..ea6774b94 100644
--- a/configure.in
+++ b/configure.in
@@ -5,11 +5,13 @@ AC_INIT(create_vcs)
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE=mc
-VERSION=4.5.34
+VERSION=4.5.35
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
+top_srcdir=`dirname $0`
+AC_SUBST(top_srcdir)
 
 AC_CANONICAL_SYSTEM
 
@@ -69,7 +71,13 @@ if test x"$X11_WWW" = x; then
 fi
 
 ALL_LINGUAS="ca cs da de es es_ES fi fr hu it ja ko no pl ro ru wa zh_TW.Big5"
+
+dnl ultra ulgy hack to get MKINSTALLDIRS right
+o=$ac_aux_dir
+ac_aux_dir=
 AM_GNU_GETTEXT
+ac_aux_dir=$o
+
 AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
 
 dnl