From 9ae2bb6790ab8d00b5cd29309889b2db50a9bef9 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 12 Mar 2001 05:16:18 +0000 Subject: [PATCH] - (bal) Reorder includes in Makefile. --- ChangeLog | 3 ++- Makefile.in | 4 ++-- openbsd-compat/Makefile.in | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1346dda5b..c6ce558c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ with -l and make -B work with /path/to/known_hosts. ok deraadt@ - (djm) Bump portable version number for generating test RPMs - (djm) Add "static_openssl" RPM build option, remove rsh build dependency + - (bal) Reorder includes in Makefile. 20010311 - OpenBSD CVS Sync @@ -4524,4 +4525,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.949 2001/03/12 03:47:30 djm Exp $ +$Id: ChangeLog,v 1.950 2001/03/12 05:16:18 mouring Exp $ diff --git a/Makefile.in b/Makefile.in index f4f77e9fd..bc54cb677 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.158 2001/03/10 21:50:46 tim Exp $ +# $Id: Makefile.in,v 1.159 2001/03/12 05:16:19 mouring Exp $ prefix=@prefix@ exec_prefix=@exec_prefix@ @@ -26,7 +26,7 @@ PATHS= -DETCDIR=\"$(sysconfdir)\" \ CC=@CC@ LD=@LD@ CFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/openbsd-compat -I$(srcdir) $(PATHS) @DEFS@ +CPPFLAGS=-I. -I$(srcdir) -I$(srcdir)/openbsd-compat @CPPFLAGS@ $(PATHS) @DEFS@ LIBS=@LIBS@ AR=@AR@ RANLIB=@RANLIB@ diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 561965bda..40d59db72 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.6 2001/02/24 00:24:20 mouring Exp $ +# $Id: Makefile.in,v 1.7 2001/03/12 05:16:19 mouring Exp $ sysconfdir=@sysconfdir@ piddir=@piddir@ @@ -9,7 +9,7 @@ VPATH=@srcdir@ CC=@CC@ LD=@LD@ CFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/.. @DEFS@ +CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ LIBS=@LIBS@ AR=@AR@ RANLIB=@RANLIB@