--- ./src/trans.h.orig	Mon Jul 26 22:42:08 1999
+++ ./src/trans.h	Mon Jul 26 22:42:22 1999
@@ -84,14 +84,14 @@
 #include <ctype.h>
 
 
-#ifdef __GNUC__      /* Fast, in-line version of strcmp */
-# define strcmp(a,b) ({ char *_aa = (a), *_bb = (b); int _diff;  \
+/* #ifdef __GNUC__      /* Fast, in-line version of strcmp */
+/* # define strcmp(a,b) ({ char *_aa = (a), *_bb = (b); int _diff;  \
 			for (;;) {    \
 			    if (!*_aa && !*_bb) { _diff = 0; break; }   \
                             if (*_aa++ != *_bb++)    \
 				{ _diff = _aa[-1] - _bb[-1]; break; }   \
 			} _diff; })
-#endif
+#endif */
 
 
 #if defined(HASDUMPS) && defined(define_globals)
--- ./src/Makefile.orig	Mon Jul 26 22:42:27 1999
+++ ./src/Makefile	Mon Jul 26 22:42:44 1999
@@ -19,22 +19,22 @@
 SHELL = /bin/sh
 
 # Directories (private version)
-HOMEDIR = ../home
-INCDIR = ../home/p2c
-BINDIR = ..
-LIBDIR = ../home
-MANDIR = ../home
-MANFILE = p2c.cat          # human-readable manual (for cat.1)
+#HOMEDIR = ../home
+#INCDIR = ../home/p2c
+#BINDIR = ..
+#LIBDIR = ../home
+#MANDIR = ../home
+#MANFILE = p2c.cat          # human-readable manual (for cat.1)
 #MANFILE = p2c.man.inst    # uncompressed nroff source (for man.1)
 #MANFILE = p2c.man.Z       # compressed nroff source (for man.1.Z)
 
 # Directories (public version)
-#HOMEDIR = /usr/lib/p2c
-#INCDIR = /usr/include/p2c
-#BINDIR = /usr/bin
-#LIBDIR = /usr/lib
-#MANDIR = /usr/man/man1
-#MANFILE = p2c.man.inst
+HOMEDIR = /usr/lib/p2c
+INCDIR = /usr/include/p2c
+BINDIR = /usr/bin
+LIBDIR = /usr/lib
+MANDIR = /usr/man/man1
+MANFILE = p2c.man.inst
 
 # Compiler options
 CC = cc                    # you may wish to use gcc here instead
--- ./examples/Makefile.orig	Mon Jul 26 22:38:52 1999
+++ ./examples/Makefile	Mon Jul 26 22:41:30 1999
@@ -4,9 +4,9 @@
 
 # The following definitions assume p2c has been compiled into the "home"
 # directory as shown in src/Makefile.
-P2C = ../p2c
-INC = ../home
-LIB = ../home/libp2c.a
+P2C = p2c
+INC = /usr/include
+LIB = -lp2c
 
 
 default: comp