diff options
| author | peter <peter@FreeBSD.org> | 2000-10-11 07:31:01 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2000-10-11 07:31:01 +0000 |
| commit | a81407a537bfd1ab9e48c69007eb6b30e66d271b (patch) | |
| tree | 9ec00b41242bbe63b83c0ac5316c539466d9f9de /contrib/ncurses/panel | |
| parent | cc6a5cc05f3c2cde24338d35c9714f1e7ebf032e (diff) | |
| download | FreeBSD-src-a81407a537bfd1ab9e48c69007eb6b30e66d271b.zip FreeBSD-src-a81407a537bfd1ab9e48c69007eb6b30e66d271b.tar.gz | |
Import ncurses-5.1-20001009 onto the vendor branch
Diffstat (limited to 'contrib/ncurses/panel')
| -rw-r--r-- | contrib/ncurses/panel/Makefile.in | 14 | ||||
| -rw-r--r-- | contrib/ncurses/panel/panel.priv.h | 32 |
2 files changed, 36 insertions, 10 deletions
diff --git a/contrib/ncurses/panel/Makefile.in b/contrib/ncurses/panel/Makefile.in index e5f528d..9b8092d 100644 --- a/contrib/ncurses/panel/Makefile.in +++ b/contrib/ncurses/panel/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.31 2000/05/28 01:40:32 tom Exp $ +# $Id: Makefile.in,v 1.34 2000/08/26 21:51:28 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@ @@ -54,8 +54,6 @@ libdir = @libdir@ includedir = @includedir@ datadir = @datadir@ -ticdir = $(datadir)/terminfo - INSTALL = @INSTALL@ INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ INSTALL_DATA = @INSTALL_DATA@ @@ -71,7 +69,7 @@ CPP = @CPP@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ \ - -DHAVE_CONFIG_H -DTERMINFO=\"$(ticdir)\" + -DHAVE_CONFIG_H CCFLAGS = $(CPPFLAGS) $(CFLAGS) @@ -111,7 +109,7 @@ install :: $(AUTO_SRC) $(LIBRARIES) sources: $(AUTO_SRC) -$(INSTALL_PREFIX)$(libdir) : +$(DESTDIR)$(libdir) : $(srcdir)/../mkinstalldirs $@ # make a copy to simplify include-paths while still keeping panel's include @@ -127,8 +125,8 @@ PANEL_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/panel/panel.priv.h b/contrib/ncurses/panel/panel.priv.h index 57bf793..f5a4798 100644 --- a/contrib/ncurses/panel/panel.priv.h +++ b/contrib/ncurses/panel/panel.priv.h @@ -1,4 +1,32 @@ -/* $Id: panel.priv.h,v 1.13 2000/01/15 20:39:53 juergen Exp $ */ +/**************************************************************************** + * Copyright (c) 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 * + * "Software"), to deal in the Software without restriction, including * + * without limitation the rights to use, copy, modify, merge, publish, * + * distribute, distribute with modifications, sublicense, and/or sell * + * copies of the Software, and to permit persons to whom the Software is * + * furnished to do so, subject to the following conditions: * + * * + * The above copyright notice and this permission notice shall be included * + * in all copies or substantial portions of the Software. * + * * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. * + * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, * + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR * + * THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * * + * Except as contained in this notice, the name(s) of the above copyright * + * holders shall not be used in advertising or otherwise to promote the * + * sale, use or other dealings in this Software without prior written * + * authorization. * + ****************************************************************************/ + +/* $Id: panel.priv.h,v 1.14 2000/09/02 18:22:23 tom Exp $ */ #ifndef _PANEL_PRIV_H #define _PANEL_PRIV_H @@ -28,7 +56,7 @@ # define INLINE #endif -#ifdef USE_RCS_IDS +#if USE_RCS_IDS # define MODULE_ID(id) static const char Ident[] = id; #else # define MODULE_ID(id) /*nothing*/ |
