Date: Sun, 29 Oct 1995 16:41:41 +0800 (WST) From: Peter Wemm <peter@jhome.DIALix.COM> To: CVS-commiters@freefall.freebsd.org, cvs-gnu@freefall.freebsd.org Subject: Re: cvs commit: src/gnu/usr.bin/rcs/lib conf.h Message-ID: <Pine.BSF.3.91.951029163722.356F-100000@jhome.DIALix.COM> In-Reply-To: <199510290835.BAA05888@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, 29 Oct 1995, Peter Wemm wrote: > peter 95/10/29 01:35:52 > > Modified: gnu/usr.bin/rcs/lib conf.h > Log: > AARGH!!!! > > Fix the hard-coded pathname to /usr/local/bin/co and /usr/local/bin/merge > that I missed... Pointed out by: bde (sorry, forgot this in the commit message) Somebody please pass the conical hat! If you're running via ctm-cvs-cur and have just got the most recent deltas, I'd suggest applying this patch to your checked out copy of rcs/lib/conf.h so that you dont get dung out to dry if you compile/install it. The upcoming cvs-src-cur probably will be OK. -Peter RCS file: /home/ncvs/src/gnu/usr.bin/rcs/lib/conf.h,v retrieving revision 1.4 diff -c -r1.4 conf.h *** 1.4 1995/10/28 21:49:25 --- conf.h 1995/10/29 08:32:09 *************** *** 210,216 **** /* Do struct stat s and t describe the same file? Answer d if unknown. */ #define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev) #define has_utimbuf 1 /* Does struct utimbuf work? */ ! #define CO "/usr/local/bin/co" /* name of 'co' program */ #define COMPAT2 0 /* Are version 2 files supported? */ #define DIFF "/usr/bin/diff" /* name of 'diff' program */ #define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */ --- 210,216 ---- /* Do struct stat s and t describe the same file? Answer d if unknown. */ #define same_file(s,t,d) ((s).st_ino==(t).st_ino && (s).st_dev==(t).st_dev) #define has_utimbuf 1 /* Does struct utimbuf work? */ ! #define CO "/usr/bin/co" /* name of 'co' program */ #define COMPAT2 0 /* Are version 2 files supported? */ #define DIFF "/usr/bin/diff" /* name of 'diff' program */ #define DIFF3 "/usr/bin/diff3" /* name of 'diff3' program */ *************** *** 221,227 **** #define DIFF_FAILURE 1 /* DIFF status if differences are found */ #define DIFF_TROUBLE 2 /* DIFF status if trouble */ #define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */ ! #define MERGE "/usr/local/bin/merge" /* name of 'merge' program */ #define TMPDIR "/tmp" /* default directory for temporary files */ #define SLASH '/' /* principal filename separator */ #define SLASHes '/' /* `case SLASHes:' labels all filename separators */ --- 221,227 ---- #define DIFF_FAILURE 1 /* DIFF status if differences are found */ #define DIFF_TROUBLE 2 /* DIFF status if trouble */ #define ED "/bin/ed" /* name of 'ed' program (used only if !DIFF3_BIN) */ ! #define MERGE "/usr/bin/merge" /* name of 'merge' program */ #define TMPDIR "/tmp" /* default directory for temporary files */ #define SLASH '/' /* principal filename separator */ #define SLASHes '/' /* `case SLASHes:' labels all filename separators */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.3.91.951029163722.356F-100000>