Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/csh fix compilation without -DEDIT



details:   https://anonhg.NetBSD.org/src/rev/bbac4952c905
branches:  trunk
changeset: 784242:bbac4952c905
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 22 22:40:31 2013 +0000

description:
fix compilation without -DEDIT

diffstat:

 bin/csh/Makefile |  8 ++++----
 bin/csh/csh.h    |  4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 3ed77ea7804d -r bbac4952c905 bin/csh/Makefile
--- a/bin/csh/Makefile  Tue Jan 22 22:10:22 2013 +0000
+++ b/bin/csh/Makefile  Tue Jan 22 22:40:31 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.34 2013/01/22 20:35:29 christos Exp $
+#      $NetBSD: Makefile,v 1.35 2013/01/22 22:40:31 christos Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -61,11 +61,11 @@
 COPTS.proc.c = -Wno-format-nonliteral
 
 .if 0
+LDADD+=-ledit -lutil
+DPADD+=${LIBEDIT} ${LIBUTIL}
+.else
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
-.elese
-LDADD+=-ledit -lutil
-DPADD+=${LIBEDIT} ${LIBUTIL}
 .endif
 
 .include <bsd.prog.mk>
diff -r 3ed77ea7804d -r bbac4952c905 bin/csh/csh.h
--- a/bin/csh/csh.h     Tue Jan 22 22:10:22 2013 +0000
+++ b/bin/csh/csh.h     Tue Jan 22 22:40:31 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.h,v 1.23 2013/01/22 20:35:29 christos Exp $ */
+/* $NetBSD: csh.h,v 1.24 2013/01/22 22:40:31 christos Exp $ */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -552,7 +552,7 @@
 #ifdef EDIT
 #include <histedit.h>
 EditLine *el;
+#endif
 int editing;
-#endif
 
 #endif /* !_CSH_H_ */



Home | Main Index | Thread Index | Old Index