diff -Nurd -x'*~' jed-0.99-16.orig/configure jed-0.99-16/configure --- jed-0.99-16.orig/configure 2002-10-20 02:55:30.000000000 -0400 +++ jed-0.99-16/configure 2005-12-08 11:06:11.000000000 -0500 @@ -2612,17 +2612,7 @@ #JD_UP_NAME[]_LIB_DIR="" # This list consists of "include,lib include,lib ..." -JD_Search_Dirs="$JD_Above_Dir2/slang/libsrc,$JD_Above_Dir2/slang/libsrc/"$ARCH"objs \ - $JD_Above_Dir/slang/libsrc,$JD_Above_Dir/slang/libsrc/"$ARCH"objs \ - $JD_Above_Dir2/slang/src,$JD_Above_Dir2/slang/src/"$ARCH"objs \ - $JD_Above_Dir/slang/src,$JD_Above_Dir/slang/src/"$ARCH"objs \ - $HOME/include,$HOME/lib" - -if test -n "$ARCH" -then - JD_Search_Dirs="$JD_Search_Dirs $HOME/include,$HOME/$ARCH/lib" - JD_Search_Dirs="$JD_Search_Dirs $HOME/include,$HOME/sys/$ARCH/lib" -fi +JD_Search_Dirs="@PREFIX@/include,@PREFIX@/lib" # Now add the standard system includes. The reason for doing this is that # the other directories may have a better chance of containing a more recent @@ -2630,12 +2620,6 @@ test "x$exec" = "xNONE" && exec="$ac_default_prefix" test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix" -JD_Search_Dirs="$JD_Search_Dirs \ - $includedir,$libdir \ - /usr/local/include,/usr/local/lib \ - /usr/include,/usr/lib \ - /usr/include/slang,/usr/lib \ - /usr/include/slang,/usr/lib/slang" echo looking for the SLANG library @@ -2645,7 +2629,7 @@ generic_include=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'` generic_lib=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'` echo Looking for slang.h in $generic_include - echo and libslang.a in $generic_lib + echo and libslang.a or libslang.dylib in $generic_lib if test -r $generic_include/slang.h && test -r $generic_lib/libslang.a then echo Found it. @@ -2653,7 +2637,7 @@ SLANG_INCLUDE="$generic_include" break else - if test -r $generic_include/slang.h && test -r $generic_lib/libslang.so + if test -r $generic_include/slang.h && test -r $generic_lib/libslang.dylib then echo Found it. SLANG_LIB_DIR="$generic_lib" diff -Nurd -x'*~' jed-0.99-16.orig/doc/manual/jed.1 jed-0.99-16/doc/manual/jed.1 --- jed-0.99-16.orig/doc/manual/jed.1 2002-10-20 02:55:30.000000000 -0400 +++ jed-0.99-16/doc/manual/jed.1 2005-12-08 10:39:33.000000000 -0500 @@ -400,7 +400,7 @@ .RS This is the default startup file. .RE -.I /etc/jed.rc +.I @PREFIX@/etc/jed.rc .RS The system wide configuration file. .RE diff -Nurd -x'*~' jed-0.99-16.orig/doc/manual/rgrep.1 jed-0.99-16/doc/manual/rgrep.1 --- jed-0.99-16.orig/doc/manual/rgrep.1 2002-10-20 02:55:30.000000000 -0400 +++ jed-0.99-16/doc/manual/rgrep.1 2005-12-08 10:40:30.000000000 -0500 @@ -1,24 +1,24 @@ .\"=========================================================================== -.\" rgrep ­ a recursive highlighting grep program, this manpage was writen by +.\" jgrep ­ a recursive highlighting grep program, this manpage was writen by .\" "Boris D. Beletsky" copyright(c) 1996 .\" This manpage may be freely distrebuted as part of GNU Debian Linux .\"=========================================================================== -.TH RGREP 1 "OCT 1996" Debian "User Manuals" +.TH JGREP 1 "OCT 1996" Debian "User Manuals" .SH NAME -rgrep \- a recursive, highlighting grep program +jgrep \- a recursive, highlighting grep program .SH SYNOPSIS -.B rgrep +.B jgrep .I [ options ] .I pattern .I [ file ] .B ... .SH DESCRIPTION -.I rgrep, +.I jgrep, unlike .I grep(1) and .I egrep(1) -rgrep has the ability to recursively descend +jgrep has the ability to recursively descend directories. The traditional way of performing this kind of search on Unix systems utilizes the @@ -172,29 +172,29 @@ printing the line containing the match with its line number: (two methods) .LP -.I rgrep -n -R '*.c' '^int ' . +.I jgrep -n -R '*.c' '^int ' . .LP -.I rgrep -n -x c '^int ' . +.I jgrep -n -x c '^int ' . .LP Highlight all matches of repeated words in file 'paper.tex': .LP -.I rgrep -h +.I jgrep -h .I '[\ \\\\t]\\\\([a-zA-Z]+\\\\)[\ \\\\t]+\\\\1[\ \\\\t\\\\n]' paper.tex .LP -.I rgrep -h '^\\\\([a-zA-Z]+\\\\)[\ \\\\t]+\\\\1[\ \\\\t\\\\n]' paper.tex +.I jgrep -h '^\\\\([a-zA-Z]+\\\\)[\ \\\\t]+\\\\1[\ \\\\t\\\\n]' paper.tex .LP -(Note that this version of rgrep requires two +(Note that this version of jgrep requires two passes for this example) .LP Search through all files EXCEPT .o and .a file below /usr/src/linux looking for the string 'mouse' without regard to case: .LP -.I rgrep -i -R '*.[^ao]' mouse /usr/src/linux +.I jgrep -i -R '*.[^ao]' mouse /usr/src/linux .LP Search a fixed record length FITS file for the keyword EXTNAME: .LP -.I rgrep -W80 ^EXTNAME file.fits +.I jgrep -W80 ^EXTNAME file.fits .LP (Note that the regular expression .I '^[A-Z]+' diff -Nurd -x'*~' jed-0.99-16.orig/info/jed.1in jed-0.99-16/info/jed.1in --- jed-0.99-16.orig/info/jed.1in 2002-10-20 02:55:30.000000000 -0400 +++ jed-0.99-16/info/jed.1in 2005-12-08 11:29:17.000000000 -0500 @@ -4,7 +4,7 @@  File: jed.info, Node: Top, Next: Introduction, Up: (dir) - Note!!! This document is nolonger maintained. See jed/doc/*.txt + Note!!! This document is nolonger maintained. See @PREFIX@/share/doc/@PACKAGE@ for more current documentation. Copyright (C) 1992, 1993 John E. Davis diff -Nurd -x'*~' jed-0.99-16.orig/info/jed.info jed-0.99-16/info/jed.info --- jed-0.99-16.orig/info/jed.info 2002-10-20 02:55:30.000000000 -0400 +++ jed-0.99-16/info/jed.info 2005-12-08 10:52:25.000000000 -0500 @@ -1,6 +1,11 @@ This is Info file jed.info, produced by Makeinfo-1.55 from the input file jed.ti. +INFO-DIR-SECTION Editors +START-INFO-DIR-ENTRY +* Jed: (jed). Programmers editor +END-INFO-DIR-ENTRY +  Indirect: jed.1in: 83 diff -Nurd -x'*~' jed-0.99-16.orig/lib/jed.conf jed-0.99-16/lib/jed.conf --- jed-0.99-16.orig/lib/jed.conf 2002-10-20 02:55:30.000000000 -0400 +++ jed-0.99-16/lib/jed.conf 2005-12-08 10:43:42.000000000 -0500 @@ -1,10 +1,11 @@ % -*- slang -*- -% This is a sample jed.conf that the user may put in /etc or /usr/local/etc +% This is a sample jed.conf that the user may put in @PREFIX@/etc + % to setup some defaults for all users. _Jed_Default_Emulation = "ide"; _Jed_Default_Color_Scheme = "blue2"; -Info_Directory = "/usr/info,/usr/share/info"; +Info_Directory = "@PREFIX@/share/info:@PREFIX@/info:/usr/share/info"; auto_compression_mode (1); enable_dfa_syntax_for_mode ("PostScript", "TCL"); diff -Nurd -x'*~' jed-0.99-16.orig/lib/site.sl jed-0.99-16/lib/site.sl --- jed-0.99-16.orig/lib/site.sl 2002-10-20 02:55:30.000000000 -0400 +++ jed-0.99-16/lib/site.sl 2005-12-08 10:43:02.000000000 -0500 @@ -3020,7 +3020,7 @@ if (strlen(expand_jedlib_file("defaults.sl"))) () = evalfile("defaults"); #ifdef UNIX -else foreach (["/etc/jed.conf", "/usr/local/etc/jed.conf", "/usr/etc/jed.conf"]) +else foreach (["@PREFIX@/etc/jed.conf"]) { $1 = (); if (1 == file_status ($1))