diff --git a/appl/ftp/common/Makefile.in b/appl/ftp/common/Makefile.in index 7b561b5ad..7325e7f40 100644 --- a/appl/ftp/common/Makefile.in +++ b/appl/ftp/common/Makefile.in @@ -22,7 +22,7 @@ libcommon_OBJS = base64.o glob.o all: libcommon.a .c.o: - $(CC) -c $(CFLAGS) -I$(srcdir) -I.. $(DEFS) $< + $(CC) -c $(CFLAGS) -I$(srcdir) -I../../../include -I.. $(DEFS) $< libcommon.a: $(libcommon_OBJS) ar cr libcommon.a $(libcommon_OBJS) diff --git a/appl/ftp/common/glob.c b/appl/ftp/common/glob.c index 0de3439ed..8e8a7a63c 100644 --- a/appl/ftp/common/glob.c +++ b/appl/ftp/common/glob.c @@ -36,14 +36,6 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; -#else -static char rcsid[] = "$NetBSD: glob.c,v 1.5 1995/02/27 04:13:35 cgd Exp $"; -#endif -#endif /* LIBC_SCCS and not lint */ - /* * glob(3) -- a superset of the one defined in POSIX 1003.2. * @@ -87,6 +79,7 @@ static char rcsid[] = "$NetBSD: glob.c,v 1.5 1995/02/27 04:13:35 cgd Exp $"; #include #include "glob.h" +#include "roken.h" #define DOLLAR '$' #define DOT '.' diff --git a/lib/roken/glob.c b/lib/roken/glob.c index 0de3439ed..8e8a7a63c 100644 --- a/lib/roken/glob.c +++ b/lib/roken/glob.c @@ -36,14 +36,6 @@ * SUCH DAMAGE. */ -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; -#else -static char rcsid[] = "$NetBSD: glob.c,v 1.5 1995/02/27 04:13:35 cgd Exp $"; -#endif -#endif /* LIBC_SCCS and not lint */ - /* * glob(3) -- a superset of the one defined in POSIX 1003.2. * @@ -87,6 +79,7 @@ static char rcsid[] = "$NetBSD: glob.c,v 1.5 1995/02/27 04:13:35 cgd Exp $"; #include #include "glob.h" +#include "roken.h" #define DOLLAR '$' #define DOT '.'