summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2000-11-01 14:34:14 +0000
committerwiz <wiz@NetBSD.org>2000-11-01 14:34:14 +0000
commitfd7b7ed13ef54ade4e84a30c4efee4b44ff6d737 (patch)
tree5c395ecaf8b2f7adeebe6b4fe86a2667988bf311
parent8aed9a24ac0400d182cd097bab03e51995afca31 (diff)
Use NetBSD's getopt{,_long}.
-rw-r--r--gnu/dist/diffutils/diff.c2
-rw-r--r--gnu/dist/diffutils/diff3.c2
-rw-r--r--gnu/dist/diffutils/sdiff.c2
-rw-r--r--gnu/usr.bin/diff/Makefile4
-rw-r--r--gnu/usr.bin/diff3/Makefile4
-rw-r--r--gnu/usr.bin/sdiff/Makefile4
6 files changed, 9 insertions, 9 deletions
diff --git a/gnu/dist/diffutils/diff.c b/gnu/dist/diffutils/diff.c
index ab1549be864..34b37867c71 100644
--- a/gnu/dist/diffutils/diff.c
+++ b/gnu/dist/diffutils/diff.c
@@ -23,7 +23,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define GDIFF_MAIN
#include "diff.h"
#include <signal.h>
-#include "getopt.h"
+#include <getopt.h>
#include "fnmatch.h"
#ifndef DEFAULT_WIDTH
diff --git a/gnu/dist/diffutils/diff3.c b/gnu/dist/diffutils/diff3.c
index 5d94ab866db..50c5acf0159 100644
--- a/gnu/dist/diffutils/diff3.c
+++ b/gnu/dist/diffutils/diff3.c
@@ -20,7 +20,7 @@
#include "system.h"
#include <stdio.h>
#include <signal.h>
-#include "getopt.h"
+#include <getopt.h>
extern char const version_string[];
diff --git a/gnu/dist/diffutils/sdiff.c b/gnu/dist/diffutils/sdiff.c
index 57d56f1dc24..0289af77573 100644
--- a/gnu/dist/diffutils/sdiff.c
+++ b/gnu/dist/diffutils/sdiff.c
@@ -22,7 +22,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "system.h"
#include <stdio.h>
#include <signal.h>
-#include "getopt.h"
+#include <getopt.h>
/* Size of chunks read from files which must be parsed into lines. */
#define SDIFF_BUFSIZE ((size_t) 65536)
diff --git a/gnu/usr.bin/diff/Makefile b/gnu/usr.bin/diff/Makefile
index d7723aa3673..1654262b3e9 100644
--- a/gnu/usr.bin/diff/Makefile
+++ b/gnu/usr.bin/diff/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 1999/07/30 04:07:24 mycroft Exp $
+# $NetBSD: Makefile,v 1.14 2000/11/01 14:34:14 wiz Exp $
PROG= diff
SRCS= diff.c analyze.c cmpbuf.c io.c context.c ed.c normal.c util.c \
- dir.c regex.c side.c ifdef.c version.c getopt.c getopt1.c
+ dir.c regex.c side.c ifdef.c version.c
CPPFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR} -I${DIST}/diffutils \
-DPR_PROGRAM=\"/usr/bin/pr\"
diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile
index b42ff5eb962..5fd7e21320e 100644
--- a/gnu/usr.bin/diff3/Makefile
+++ b/gnu/usr.bin/diff3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 1999/07/30 04:07:24 mycroft Exp $
+# $NetBSD: Makefile,v 1.12 2000/11/01 14:34:14 wiz Exp $
PROG= diff3
-SRCS= diff3.c getopt.c getopt1.c version.c
+SRCS= diff3.c version.c
CPPFLAGS+= -I${.CURDIR}/../diff -I${DIST}/diffutils \
-DHAVE_CONFIG_H -DDIFF_PROGRAM=\"/usr/bin/diff\"
diff --git a/gnu/usr.bin/sdiff/Makefile b/gnu/usr.bin/sdiff/Makefile
index 176ee85a87d..628b3cf50a2 100644
--- a/gnu/usr.bin/sdiff/Makefile
+++ b/gnu/usr.bin/sdiff/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 1999/07/30 04:07:26 mycroft Exp $
+# $NetBSD: Makefile,v 1.11 2000/11/01 14:34:15 wiz Exp $
PROG= sdiff
-SRCS= sdiff.c getopt.c getopt1.c version.c
+SRCS= sdiff.c version.c
CPPFLAGS+= -I${.CURDIR}/../diff -I${DIST}/diffutils \
-DHAVE_CONFIG_H -DDIFF_PROGRAM=\"/usr/bin/diff\"