From 2ad1cdfeef73a1a7894fecbc9e78031d94d027a2 Mon Sep 17 00:00:00 2001
From: April White <april@users.sourceforge.net>
Date: Tue, 16 May 2000 04:01:13 +0000
Subject: [PATCH] 20000516-03:55 GMT+4 April White <awhite@user.rose.com>

---
 harbour/ChangeLog           |  6 ++++++
 harbour/source/rtl/Makefile | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 06ff7df471..11142314ac 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+20000516-03:55 GMT+4 April White <awhite@user.rose.com>
+
+  * source\rtl\makefile
+    - setkey.prg from PRG_SOURCES section (a conflict prevented the prev update)
+    + setkey.c to C_SOURCES section
+
 20000515-19:45 GMT-8 Ron Pinkas <Ron@Profit-Master.com>
 
   * source/compiler/harbour.l
diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile
index 9de83696db..b6527c2fd1 100644
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -78,11 +78,12 @@ C_SOURCES=\
 	scroll.c     \
 	seconds.c    \
 	set.c        \
-	setcolor.c   \
-	setcurs.c    \
-	setpos.c     \
-	setposbs.c   \
-	shadow.c     \
+  setcolor.c   \
+  setcurs.c    \
+  setkey.c     \
+  setpos.c     \
+  setposbs.c   \
+  shadow.c     \
 	soundex.c    \
 	space.c      \
 	str.c        \
@@ -130,7 +131,6 @@ PRG_SOURCES=\
 	readkey.prg  \
 	readvar.prg  \
 	setfunc.prg  \
-	setkey.prg   \
 	setta.prg    \
 	tclass.prg   \
 	tbcolumn.prg \