From f40696360463d6d5eac04403e15fc71c507eef28 Mon Sep 17 00:00:00 2001
From: irox <irox>
Date: Wed, 19 Sep 2001 00:44:46 +0000
Subject: [PATCH] 	* Makefile.in: Fixed bad merge when installing 
 ../doc/*.n man files.

---
 tk/unix/ChangeLog   | 3 +++
 tk/unix/Makefile.in | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tk/unix/ChangeLog b/tk/unix/ChangeLog
index 90f5bff16e..a316a6d8b5 100644
--- a/tk/unix/ChangeLog
+++ b/tk/unix/ChangeLog
@@ -1,5 +1,8 @@
 2001-09-18  Ian Roxborough  <irox@redhat.com>
 
+	* Makefile.in: Fixed bad merge when installing
+	../doc/*.n man files.
+
 	* Makefile.in: Added TK_CFLAGS for flags that
 	shouldn't be supressed by the top level Makefile's
 	CFLAGS settings.
diff --git a/tk/unix/Makefile.in b/tk/unix/Makefile.in
index 244fe79a01..b700ea991f 100644
--- a/tk/unix/Makefile.in
+++ b/tk/unix/Makefile.in
@@ -621,8 +621,8 @@ install-doc:
 	    do \
 	    rm -f $(MANN_INSTALL_DIR)/$$i; \
 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
-		    $$i > $(MAN3_INSTALL_DIR)/$$name; \
-	    chmod 644 $(MAN3_INSTALL_DIR)/$$name; \
+		    $$i > $(MANN_INSTALL_DIR)/$$i; \
+	    chmod 644 $(MANN_INSTALL_DIR)/$$i; \
 	    done;
 	@echo "Cross-linking command (.n) docs";
 	@$(UNIX_DIR)/mkLinks $(MANN_INSTALL_DIR)
-- 
2.11.0