aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses/form
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2002-05-21 05:30:25 +0000
committerPeter Wemm <peter@FreeBSD.org>2002-05-21 05:30:25 +0000
commit39f2269fcb4873fd97d70af944ec49f4230fadea (patch)
treebd986d58f5a6e348466b5362637ba93e6cd5bf8c /contrib/ncurses/form
parent7e6a63408cfb0b48f0e41f77ed82f5d0ca60bda5 (diff)
downloadsrc-39f2269fcb4873fd97d70af944ec49f4230fadea.tar.gz
src-39f2269fcb4873fd97d70af944ec49f4230fadea.zip
Import ncurses-5.2-20020518 onto the vendor branch.
Obtained from: ftp://dickey.his.com/ncurses/
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=97049
Diffstat (limited to 'contrib/ncurses/form')
-rw-r--r--contrib/ncurses/form/Makefile.in15
-rw-r--r--contrib/ncurses/form/form.h2
2 files changed, 11 insertions, 6 deletions
diff --git a/contrib/ncurses/form/Makefile.in b/contrib/ncurses/form/Makefile.in
index 8f3f2976e407..e55afcb55e4e 100644
--- a/contrib/ncurses/form/Makefile.in
+++ b/contrib/ncurses/form/Makefile.in
@@ -1,6 +1,6 @@
-# $Id: Makefile.in,v 1.32 2001/03/24 19:53:31 tom Exp $
+# $Id: Makefile.in,v 1.36 2002/01/20 01:49:17 tom Exp $
##############################################################################
-# Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. #
+# Copyright (c) 1998,1999,2000,2001,2002 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 "Software"), #
@@ -50,6 +50,7 @@ DESTDIR = @DESTDIR@
srcdir = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
+bindir = @bindir@
libdir = @libdir@
includedir = @includedir@
@@ -57,6 +58,7 @@ LIBTOOL = @LIBTOOL@
INSTALL = @INSTALL@
INSTALL_LIB = @INSTALL@ @INSTALL_LIB@
+INSTALL_PROG = @INSTALL_PROG@
INSTALL_DATA = @INSTALL_DATA@
AR = @AR@
@@ -85,7 +87,7 @@ CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@)
LINK = $(LIBTOOL) $(CC)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
-SHLIB_DIRS = -L../lib -L$(libdir)
+SHLIB_DIRS = -L../lib
SHLIB_LIST = $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
MK_SHARED_LIB = @MK_SHARED_LIB@
@@ -97,6 +99,8 @@ ABI_VERSION = @cf_cv_abi_version@
RANLIB = @RANLIB@
+IMPORT_LIB = @IMPORT_LIB@
+SHARED_LIB = @SHARED_LIB@
LIBRARIES = @LIBS_TO_MAKE@
LINT = @LINT@
@@ -113,8 +117,9 @@ install :: $(AUTO_SRC) $(LIBRARIES)
sources : $(AUTO_SRC)
+$(DESTDIR)$(bindir) \
$(DESTDIR)$(libdir) :
- $(srcdir)/../mkinstalldirs $@
+ sh $(srcdir)/../mkinstalldirs $@
# make copies to simplify include-paths while still keeping form's include
# file in this directory.
@@ -136,7 +141,7 @@ tags:
@MAKE_UPPER_TAGS@ etags *.[ch]
mostlyclean ::
- -rm -f core tags TAGS *~ *.i *.ln *.atac trace
+ -rm -f core tags TAGS *~ *.bak *.i *.ln *.atac trace
clean :: mostlyclean
-rm -f $(AUTO_SRC)
diff --git a/contrib/ncurses/form/form.h b/contrib/ncurses/form/form.h
index 70b7a3ba4e9a..140b25f0ab38 100644
--- a/contrib/ncurses/form/form.h
+++ b/contrib/ncurses/form/form.h
@@ -332,7 +332,7 @@ extern NCURSES_EXPORT(Field_Options) field_opts (const FIELD *);
extern NCURSES_EXPORT(FORM *) new_form (FIELD **);
-extern NCURSES_EXPORT(FIELD **)form_fields (const FORM *);
+extern NCURSES_EXPORT(FIELD **) form_fields (const FORM *);
extern NCURSES_EXPORT(FIELD *) current_field (const FORM *);
extern NCURSES_EXPORT(WINDOW *) form_win (const FORM *);