diff -Naur tkgate-old/Imakefile tkgate-new/Imakefile --- tkgate-old/Imakefile 2005-07-25 10:04:47.000000000 -0400 +++ tkgate-new/Imakefile 2005-07-25 10:07:45.000000000 -0400 @@ -99,4 +99,4 @@ @echo "All files from ${HOMEDIR}" install:: - cp -r locale ${HOMEDIR} + cp -r locale ${DESTDIR}${HOMEDIR} diff -Naur tkgate-old/config.h tkgate-new/config.h --- tkgate-old/config.h 2005-07-25 10:04:47.000000000 -0400 +++ tkgate-new/config.h 2005-07-25 10:10:25.000000000 -0400 @@ -52,13 +52,13 @@ double quotes and should be all one one line. This list is used to find X11, tcl and tk. */ -#define TKGATE_INCDIRS "/usr/X11R6/include /usr/X11/include /pkgs/include /usr/local/include /usr/openwin/include /usr/X/include /usr/include /sw/include" +#define TKGATE_INCDIRS "/usr/X11R6/include /usr/X11/include /pkgs/include /usr/local/include /usr/openwin/include /usr/X/include /usr/include" /* List of directories to search for tcl library. The list must be in double quotes and should be all one one line. */ -#define TKGATE_LIBDIRS "/usr/X11R6/lib /usr/X11/lib /pkgs/lib /usr/local/lib /usr/lib /sw/lib" +#define TKGATE_LIBDIRS "/usr/X11R6/lib /usr/X11/lib /pkgs/lib /usr/local/lib /usr/lib" /* Required libraries. TkGate will not compile unless these libraries are found. @@ -85,13 +85,13 @@ The location of the tkgate and gmac executables. If you change this, you will need to run the configure script again. */ -#define TKGATE_BINDIR /usr/X11R6/bin +#define TKGATE_BINDIR @PREFIX@/bin /* The location of the tkgate and gmac man pages. If you change this, you will need to run the configure script again. */ -#define TKGATE_MANDIR /usr/X11R6/man/man1 +#define TKGATE_MANDIR @PREFIX@/share/man/man1 /* Digital circuit editor and simulator. @@ -101,7 +101,7 @@ /* URL for local documentation */ -#define TKGATE_LOCALDOC "file:/usr/X11R6/lib/tkgate-" TKGATE_VERSION "/doc/index.html" +#define TKGATE_LOCALDOC "file:@PREFIX@/share/doc/index.html" /* The TkGate Copyright message. @@ -204,16 +204,14 @@ */ /* - * Set this to the list of include file directories to search - * - * #define TKGATE_IPATH -I/usr/local/include/tk8.0 -I/usr/local/include/tcl8.0 -I/usr/X11R6/include + * Set this to the list of library directories to search */ +#define TKGATE_LPATH -L@PREFIX@/lib -L/usr/lib -L/usr/X11R6/lib /* - * Set this to the list of libraries to link with - * - * #define TKGATE_LIBS -ltk80 -ltcl80 -lX11 -lm + * Set this to the list of include file directories to search */ +#define TKGATE_IPATH -I@PREFIX@/include -I/usr/include -I/usr/X11R6/include /* @@ -221,9 +219,8 @@ * script files, and the simulator executable. This directory * name must be in quotes. If you change this, you will need to run * the configure script again. - * - * #define TKGATE_HOMEDIR "/usr/home/tkgate" */ +#define TKGATE_HOMEDIR "@PREFIX@/share/tkgate" /* * Set this to a backup directory to search for the tkgate home directory.