--- config.h.orig	Sun Jun  8 05:24:52 2003
+++ config.h	Sun Jun  8 05:26:54 2003
@@ -36,15 +36,15 @@
  * (LIBDIR is defined by imake)
  *
  */
-INFODIR = /usr/info
-PCBLIBDIR = $(LIBDIR)/pcb
+INFODIR = ${PREFIX}/info
+PCBLIBDIR = ${PREFIX}/lib/pcb
 DEFAULTFONT = default_font
 DEFAULTLIBRARY = pcblib
 
 /* ----------------------------------------------------------------------
  * the name of GNU m4 (you MUST use GNU m4)
  */
-GNUM4 = m4
+GNUM4 = gm4
 
 /* ----------------------------------------------------------------------
  * BTNMOD determies the modifier key to be used for the