From cf6d7faebb6f6989dbf4bac25081e50eafb640ee Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 7 Dec 2006 00:27:13 +0100 Subject: Imported from util-linux-2.13-pre6 tarball. --- getopt/Changelog | 4 ++++ getopt/Makefile.in | 2 +- getopt/README | 7 ++++--- getopt/getopt.1 | 2 +- getopt/getopt.c | 8 +++++--- 5 files changed, 15 insertions(+), 8 deletions(-) (limited to 'getopt') diff --git a/getopt/Changelog b/getopt/Changelog index f37fa66a9..ee2796550 100644 --- a/getopt/Changelog +++ b/getopt/Changelog @@ -1,3 +1,7 @@ +20051107: Bumped up version number to 1.1.4 +20051107: Makefile: package target +20051107: Changed email and website to current ones +20051107: Fixed a few typos in the manpage (sync with util-linux (2.12r) 20030123: Bumped up version number to 1.1.3 20030123: Changed WITH_GETTEXT option to WITHOUT_GETTEXT 20030123: Renamed example programs to have the string getopt- prepended diff --git a/getopt/Makefile.in b/getopt/Makefile.in index 6521fa81e..44a4e0268 100644 --- a/getopt/Makefile.in +++ b/getopt/Makefile.in @@ -240,7 +240,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ usrbinexecdir = $(prefix)/usr/bin usrsbinexecdir = $(prefix)/usr/sbin -AM_CPPFLAGS = -include $(top_srcdir)/config.h -I$(top_srcdir)/include +AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include DEFAULT_INCLUDES = getopt_CFLAGS = -DLIBCGETOPT=1 man_MANS = getopt.1 diff --git a/getopt/README b/getopt/README index 1d795f5e4..dbf7bb018 100644 --- a/getopt/README +++ b/getopt/README @@ -69,12 +69,13 @@ COPYING This program comes under the GNU general public licence version 2. See the file COPYING included in this package. Note that though you may freely -copy it, it is copyright (c) 1997 by Frodo Looijaard . +copy it, it is copyright (c) 1997-2005 by Frodo Looijaard +. Files in the gnu directory are from glibc-2.0.4: copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. DOWNLOADING -You can find the latest version of this program at -. +You can find the latest version of this program at: + http://software.frodo.looijaard.name/getopt/ diff --git a/getopt/getopt.1 b/getopt/getopt.1 index 65241e32a..874e462b3 100644 --- a/getopt/getopt.1 +++ b/getopt/getopt.1 @@ -433,7 +433,7 @@ not very intuitive (you have to set them explicitely to the empty string). .SH AUTHOR -Frodo Looijaard +Frodo Looijaard .SH "SEE ALSO" .BR getopt (3), .BR bash (1), diff --git a/getopt/getopt.c b/getopt/getopt.c index 785431f5d..10396a0c6 100644 --- a/getopt/getopt.c +++ b/getopt/getopt.c @@ -1,6 +1,6 @@ /* getopt.c - Enhanced implementation of BSD getopt(1) - Copyright (c) 1997, 1998, 1999, 2000 Frodo Looijaard + Copyright (c) 1997-2005 Frodo Looijaard This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,6 +35,8 @@ * Version 1.1.0: Tue Jun 30 2000 * Added NLS support (partly written by Arkadiusz Mikiewicz * ) + * Version 1.1.4: Mon Nov 7 2005 + * Fixed a few type's in the manpage */ #include @@ -371,7 +373,7 @@ int main(int argc, char *argv[]) int opt; int compatible=0; -#ifdef WITHOUT_GETTEXT +#if WITHOUT_GETTEXT #else setlocale(LC_ALL,""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -441,7 +443,7 @@ int main(int argc, char *argv[]) quote=0; break; case 'V': - printf(_("getopt (enhanced) 1.1.3\n")); + printf(_("getopt (enhanced) 1.1.4\n")); exit(0); case '?': case ':': -- cgit v1.2.3-55-g7522