From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 cpukit/ftpd/Makefile.am | 15 ++++++++++++---
 cpukit/ftpd/ftpd.c      |  5 +++++
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'cpukit/ftpd')

diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am
index 77d1677844..2c1d356fab 100644
--- a/cpukit/ftpd/Makefile.am
+++ b/cpukit/ftpd/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -22,10 +22,19 @@ include $(top_srcdir)/../../../automake/lib.am
 $(LIB): $(OBJS)
 	$(make-library)
 
-all-local: $(ARCH) $(OBJS) $(LIB)
+all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = ftpd.c ftpd.h
 
+H_FILES = ftpd.h
+
+noinst_HEADERS = $(H_FILES)
+
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+$(PROJECT_INCLUDE)/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/ftpd/ftpd.c b/cpukit/ftpd/ftpd.c
index 25b1f3c4e4..aef88c82c7 100644
--- a/cpukit/ftpd/ftpd.c
+++ b/cpukit/ftpd/ftpd.c
@@ -899,6 +899,11 @@ rtems_ftpd_session(rtems_task_argument arg)
  * Change History:                                                        *
  *  12/01/97 - Creation (JWJ)                                             *
  *************************************************************************/
+
+/* this is not prototyped in strict ansi mode */
+
+FILE *fdopen (int fildes, const char *mode);
+
 static void
 rtems_ftpd_daemon()
 {
-- 
cgit v1.2.3