$NetBSD: patch-ab,v 1.4 1998/11/12 15:48:34 agc Exp $ --- cda_d/Imakefile.orig Wed Oct 28 03:03:25 1998 +++ cda_d/Imakefile Wed Nov 4 22:37:14 1998 @@ -42,11 +42,11 @@ * One of these should be defined for tty mode control */ #if defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) || \ - defined(OsfArchitecture) || \ + defined(OsfArchitecture) || defined(NetBSDArchitecture) || \ (defined(SunArchitecture) && OSMajorVersion == 4) DEFINES= -DBSDCOMPAT -DUSE_TERMIOS #else -#if defined(NetBSDArchitecture) || defined(__bsdi__) +#if defined(__bsdi__) DEFINES= -DBSDCOMPAT -DNOVISUAL -DUSE_TERMIOS #else #if defined(sony_news) @@ -62,8 +62,8 @@ #endif /* XmacIIServer */ #endif /* BSD */ #endif /* sony_news */ -#endif /* NetBSDArchitecture __bsdi__ */ -#endif /* FreeBSD OpenBSD OsfArchitecture SunArchitecture */ +#endif /* __bsdi__ */ +#endif /* FreeBSD OpenBSD OsfArchitecture NetBSD SunArchitecture */ /* @@ -79,7 +79,7 @@ #endif /* LinuxArchitecture */ #endif /* SunArchitecture */ -INCLUDES=-I.. +INCLUDES=-I.. -I${LOCALBASE}/include /* @@ -97,7 +97,10 @@ LOCAL_LIBRARIES+= -lcam .endif #else -#if defined(NetBSDArchitecture) || defined(__bsdi__) +#if defined(NetBSDArchitecture) +LOCAL_LIBRARIES=-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lncurses +#else +#if defined(__bsdi__) LOCAL_LIBRARIES= #else #if defined(OpenBSDArchitecture) @@ -117,9 +120,10 @@ #endif /* SINIX */ #endif /* ultrix */ #endif /* OpenBSDArchitecture */ -#endif /* NetBSDArchitecture __bsdi__ */ +#endif /* __bsdi__ */ +#endif /* NetBSDArchitecture */ #endif /* FreeBSDArchitecture */ -#endif /* LinuxArchitecture OpenBSDArchitecture */ +#endif /* LinuxArchitecture */ #endif /* SunArchitecture */