diff -urN aee-2.2.15b/aee.1 aee-2.2.15b.new/aee.1 --- aee-2.2.15b/aee.1 Sat Jul 6 00:57:10 2002 +++ aee-2.2.15b.new/aee.1 Sun Feb 6 20:28:48 2005 @@ -678,7 +678,7 @@ .\" .SS Initializing aee From A File .PP -\fIaee\fR checks for a file named \fIinit.ae\fR in \fI/usr/local/lib\fR, +\fIaee\fR checks for a file named \fIinit.ae\fR in \fI@PREFIX@/share/aee\fR, .I .init.ae in the user's home directory, then for \fI.init.ae\fR in the current directory. (This file may be created manually or by using the @@ -960,7 +960,7 @@ .PP On-line help is provided through the 'help' command or menu item. This command uses a file with help information. By default the help file is -located in \fB/usr/local/lib/help.ae\fR, but this file may be located +located in \fB@PREFIX@/share/aee/help.ae\fR, but this file may be located in the user's home directory with the name \fB.help.ae\fR, or in the current directory with the name \fBhelp.ae\fR. .\" @@ -1017,7 +1017,7 @@ .\" .SH FILES .PP -.I /usr/local/lib/init.ae +.I @PREFIX@/share/aee/init.ae .br .I $HOME/.aeeinfo .br diff -urN aee-2.2.15b/aee.c aee-2.2.15b.new/aee.c --- aee-2.2.15b/aee.c Sat Jul 6 01:03:09 2002 +++ aee-2.2.15b.new/aee.c Sun Feb 6 20:26:19 2005 @@ -2610,9 +2610,8 @@ fflush(stdout); } -char *init_name[4] = { - "/usr/local/aee/init.ae", - "/usr/local/lib/init.ae", +char *init_name[3] = { + "@PREFIX@/share/aee/init.ae", NULL, ".init.ae" }; @@ -2633,13 +2632,13 @@ home = xalloc(11); strcpy(home, "~/.init.ae"); - init_name[2] = resolve_name(home); + init_name[1] = resolve_name(home); string = xalloc(512); - for (counter = 0; counter < 4; counter++) + for (counter = 0; counter < 3; counter++) { lines = 1; - if (!(access(init_name[counter], 4))) + if (!(access(init_name[counter], 3))) { init_file = fopen(init_name[counter], "r"); while ((str2 = fgets(string, 512, init_file)) != NULL) diff -urN aee-2.2.15b/aee.msg aee-2.2.15b.new/aee.msg --- aee-2.2.15b/aee.msg Sat Jan 16 23:18:44 1999 +++ aee-2.2.15b.new/aee.msg Sun Feb 6 20:23:51 2005 @@ -2,7 +2,7 @@ $ $set 1 $quote " -1 "/usr/local/lib/help.ae" +1 "@PREFIX@/share/aee/help.ae" 2 "main" 3 "modes menu" 4 "tabs to spaces " diff -urN aee-2.2.15b/catalog.aee aee-2.2.15b.new/catalog.aee --- aee-2.2.15b/catalog.aee Thu Aug 13 21:03:27 1998 +++ aee-2.2.15b.new/catalog.aee Sun Feb 6 20:24:25 2005 @@ -2,7 +2,7 @@ $ $set 1 $quote " -1 "/usr/local/lib/help.ae" +1 "@PREFIX@/share/aee/help.ae" 2 "main" 3 "modes menu" 4 "tabs to spaces " diff -urN aee-2.2.15b/help.ae aee-2.2.15b.new/help.ae --- aee-2.2.15b/help.ae Mon Feb 4 00:24:32 2002 +++ aee-2.2.15b.new/help.ae Sun Feb 6 20:23:06 2005 @@ -1058,11 +1058,11 @@ The file 'init.ae' may be used to set parameters and define keys to perform certain functions within ae. This file may reside in three -locations: /usr/local/lib/init.ae, .init.ae in your home directory, and +locations: @PREFIX@/share/aee/init.ae, .init.ae in your home directory, and .init.ae in the current working directory. First, aee checks for a system level initialization file, located in -/usr/local/lib. Next the user's home directory is checked for a file named +@PREFIX@/share/aee. Next the user's home directory is checked for a file named .init.ae, then the current directory. The settings from each file are read, so that the directives from the most recently read file will take precedence over previously read files. This allows, for example, the .init.ae file in diff -urN aee-2.2.15b/help.c aee-2.2.15b.new/help.c --- aee-2.2.15b/help.c Sun Jan 31 23:28:23 1999 +++ aee-2.2.15b.new/help.c Sun Feb 6 20:21:35 2005 @@ -10,9 +10,8 @@ #include "aee.h" -char *help_file_list[4] = { - "/usr/local/aee/help.ae", - "/usr/local/lib/help.ae", +char *help_file_list[3] = { + "@PREFIX@/share/aee/help.ae", "~/.help.ae", "help.ae" }; @@ -26,7 +25,7 @@ go_on = TRUE; if ((fp = fopen(ae_help_file, "r")) == NULL) { - for (counter = 0; (counter < 4) && (fp == NULL); counter++) + for (counter = 0; (counter < 3) && (fp == NULL); counter++) { string = resolve_name(help_file_list[counter]); fp = fopen(string, "r"); diff -urN aee-2.2.15b/localize.c aee-2.2.15b.new/localize.c --- aee-2.2.15b/localize.c Sat Jul 6 01:02:21 2002 +++ aee-2.2.15b.new/localize.c Sun Feb 6 20:19:58 2005 @@ -64,7 +64,7 @@ catalog = catopen("aee", 0); #endif /* NO_CATGETS */ - ae_help_file = catgetlocal( 1, "/usr/local/lib/help.ae"); + ae_help_file = catgetlocal( 1, "@PREFIX@/share/aee/help.ae"); main_buffer_name = catgetlocal( 2, "main"); diff -urN aee-2.2.15b/make.aee aee-2.2.15b.new/make.aee --- aee-2.2.15b/make.aee Wed Dec 31 19:00:00 1969 +++ aee-2.2.15b.new/make.aee Sun Feb 6 20:52:03 2005 @@ -0,0 +1,39 @@ +DEFINES = -DBSD_SELECT + +CFLAGS = -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -O3 -DNO_CATGETS -DSLCT_HDR + + +all : curses + +OBJS = aee.o control.o format.o localize.o srch_rep.o delete.o mark.o motion.o keys.o help.o windows.o journal.o file.o + +.c.o: + cc $(DEFINES) -c $*.c $(CFLAGS) + +curses : $(OBJS) + cc -o aee $(OBJS) $(CFLAGS) -lcurses + +aee : $(OBJS) new_curse.o + cc -o aee $(OBJS) new_curse.o $(CFLAGS) + +new_curse.o : new_curse.c new_curse.h + cc new_curse.c -c $(DEFINES) $(CFLAGS) + + +aee.o: aee.c aee.h new_curse.h +control.o: control.c aee.h new_curse.h +delete.o: delete.c aee.h new_curse.h +format.o: format.c aee.h new_curse.h +help.o: help.c aee.h new_curse.h +journal.o: journal.c aee.h new_curse.h +windows.o: windows.c aee.h new_curse.h +file.o: file.c aee.h new_curse.h +keys.o: keys.c aee.h new_curse.h +localize.o: localize.c aee.h new_curse.h +mark.o: mark.c aee.h new_curse.h +motion.o: motion.c aee.h new_curse.h +new_curse.o: new_curse.c aee.h new_curse.h +srch_rep.o: srch_rep.c aee.h new_curse.h +xif.o: xif.c aee.h new_curse.h +new_curse.o: new_curse.c new_curse.h + diff -urN aee-2.2.15b/xae_dir/make.xae aee-2.2.15b.new/xae_dir/make.xae --- aee-2.2.15b/xae_dir/make.xae Wed Dec 31 19:00:00 1969 +++ aee-2.2.15b.new/xae_dir/make.xae Sun Feb 6 20:54:42 2005 @@ -0,0 +1,49 @@ +DEFINES = -DXAE -Dxae11 + +CFLAGS = -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB -DHAS_CTYPE -DHAS_SYS_IOCTL -DHAS_SYS_WAIT -I/usr/X11R6/include -L/usr/X11R6/lib -O3 -DNO_CATGETS + + +all : xae + +CC_CMD = cc $(DEFINES) -I.. -c $(CFLAGS) + +OBJS = aee.o control.o format.o localize.o srch_rep.o delete.o mark.o motion.o keys.o help.o windows.o journal.o file.o + +xae : $(OBJS) Xcurse.o xif.o + cc -o ../xae $(OBJS) Xcurse.o xif.o $(CFLAGS) -lX11 + + + +Xcurse.o: ../Xcurse.c ../aee.h ../Xcurse.h + ${CC_CMD} ../Xcurse.c +aee.o: ../aee.c ../aee.h ../Xcurse.h + ${CC_CMD} ../aee.c +control.o: ../control.c ../aee.h ../Xcurse.h + ${CC_CMD} ../control.c +delete.o: ../delete.c ../aee.h ../Xcurse.h + ${CC_CMD} ../delete.c +format.o: ../format.c ../aee.h ../Xcurse.h + ${CC_CMD} ../format.c +help.o: ../help.c ../aee.h ../Xcurse.h + ${CC_CMD} ../help.c +journal.o: ../journal.c ../aee.h ../Xcurse.h + ${CC_CMD} ../journal.c +file.o: ../file.c ../aee.h ../Xcurse.h + ${CC_CMD} ../file.c +keys.o: ../keys.c ../aee.h ../Xcurse.h + ${CC_CMD} ../keys.c +localize.o: ../localize.c ../aee.h ../Xcurse.h + ${CC_CMD} ../localize.c +mark.o: ../mark.c ../aee.h ../Xcurse.h + ${CC_CMD} ../mark.c +motion.o: ../motion.c ../aee.h ../Xcurse.h + ${CC_CMD} ../motion.c +new_curse.o: ../new_curse.c ../aee.h ../Xcurse.h + ${CC_CMD} ../new_curse.c +srch_rep.o: ../srch_rep.c ../aee.h ../Xcurse.h + ${CC_CMD} ../srch_rep.c +windows.o: ../windows.c ../aee.h ../Xcurse.h + ${CC_CMD} ../windows.c +xif.o: ../xif.c ../aee.h ../Xcurse.h + ${CC_CMD} ../xif.c +