From a81407a537bfd1ab9e48c69007eb6b30e66d271b Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Wed, 11 Oct 2000 07:31:01 +0000
Subject: Import ncurses-5.1-20001009 onto the vendor branch

---
 contrib/ncurses/menu/Makefile.in | 10 +++++-----
 contrib/ncurses/menu/menu.h      |  4 ++++
 contrib/ncurses/menu/mf_common.h |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'contrib/ncurses/menu')

diff --git a/contrib/ncurses/menu/Makefile.in b/contrib/ncurses/menu/Makefile.in
index 3d802c0..322e94e 100644
--- a/contrib/ncurses/menu/Makefile.in
+++ b/contrib/ncurses/menu/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.28 2000/05/28 01:40:08 tom Exp $
+# $Id: Makefile.in,v 1.30 2000/08/26 21:51:35 tom Exp $
 ##############################################################################
 # Copyright (c) 1998-2000 Free Software Foundation, Inc.                     #
 #                                                                            #
@@ -46,7 +46,7 @@ SHELL		= /bin/sh
 THIS		= Makefile
 
 MODEL		= @DFT_LWR_MODEL@
-INSTALL_PREFIX	= @INSTALL_PREFIX@
+DESTDIR		= @DESTDIR@
 srcdir		= @srcdir@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
@@ -111,7 +111,7 @@ install ::	$(AUTO_SRC) $(LIBRARIES)
 
 sources :	$(AUTO_SRC)
 
-$(INSTALL_PREFIX)$(libdir) :
+$(DESTDIR)$(libdir) :
 	$(srcdir)/../mkinstalldirs $@
 
 # make copies to simplify include-paths while still keeping menu's include
@@ -134,8 +134,8 @@ MENU_PRIV_H = \
 tags:
 	ctags *.[ch]
 
-TAGS:
-	etags *.[ch]
+@MAKE_UPPER_TAGS@TAGS:
+@MAKE_UPPER_TAGS@	etags *.[ch]
 
 mostlyclean ::
 	-rm -f core tags TAGS *~ *.ln *.atac trace
diff --git a/contrib/ncurses/menu/menu.h b/contrib/ncurses/menu/menu.h
index 4b4a286..5be728b 100644
--- a/contrib/ncurses/menu/menu.h
+++ b/contrib/ncurses/menu/menu.h
@@ -33,6 +33,10 @@
 #ifndef ETI_MENU
 #define ETI_MENU
 
+#ifdef AMIGA
+#define TEXT TEXT_ncurses
+#endif
+
 #include <curses.h>
 #include <eti.h>
 
diff --git a/contrib/ncurses/menu/mf_common.h b/contrib/ncurses/menu/mf_common.h
index c13f6c8..6b1e8fe 100644
--- a/contrib/ncurses/menu/mf_common.h
+++ b/contrib/ncurses/menu/mf_common.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -56,7 +56,7 @@ extern int errno;
 
 #include <nc_alloc.h>
 
-#ifdef USE_RCS_IDS
+#if USE_RCS_IDS
 #define MODULE_ID(id) static const char Ident[] = id;
 #else
 #define MODULE_ID(id) /*nothing*/
-- 
cgit v1.1