--- Makefile.in.orig	Mon Mar 11 08:56:16 2002
+++ Makefile.in	Sun Nov 27 00:07:10 2005
@@ -19,6 +19,7 @@
 
 BINDIR = @bindir@
 LIBDIR = @libdir@
+INCLUDEDIR = @includedir@
 MANDIR = @mandir@/man3
 
 
@@ -47,6 +48,7 @@
 #############################################################################
 
 CFLAGS          = @CFLAGS@ -Wall -Wstrict-prototypes -Wshadow -Wconversion -pedantic \
+                  -I$(INCLUDEDIR) -L$(LIBDIR) \
                   @PARANOID_FU@ -Wunreachable-code -Wmissing-prototypes \
                   -Waggregate-return -W -Wfloat-equal -Wsign-compare \
                   -Wwrite-strings
@@ -66,29 +68,25 @@
 	$(CC) $(CFLAGS) pcrsed.c pcrs.@OBJEXT@ -o pcrsed@EXEEXT@ $(LIBS)
 
 shared:	pcrs.@OBJEXT@
-	$(CC) $(CLFLAGS) $(LDFLAGS) $(LIBFLAGS) -Wl,-soname,libpcrs.so.$(VERSION_MAJOR) -o libpcrs.so.$(VERSION) pcrs.@OBJEXT@ $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBFLAGS) -Wl,-soname,libpcrs.so.$(VERSION_MAJOR) -o libpcrs.so.$(VERSION_MAJOR) pcrs.@OBJEXT@ $(LIBS)
 
 static:
 	$(AR) libpcrs.a pcrs.@OBJEXT@
 
 install: all
-	$(INSTALL) -m 755 libpcrs.so.$(VERSION) $(LIBDIR)
-	$(LN_S) -f libpcrs.so.$(VERSION) $(LIBDIR)/libpcrs.so
-	$(INSTALL) -m 644 libpcrs.a $(LIBDIR)
+	$(INSTALL) -m 755 libpcrs.so.$(VERSION_MAJOR) $(prefix)/lib
+	$(LN_S) -f libpcrs.so.$(VERSION_MAJOR) $(prefix)/lib/libpcrs.so
+	$(INSTALL) -m 644 libpcrs.a $(prefix)/lib
 	$(INSTALL) -m 644 pcrs.3 $(MANDIR)
 
-	if test "$(HAVE_GZIP)" = "yes"; then \
-	  gzip -f $(MANDIR)/pcrs.3; \
-	fi
-
 	@echo -e " ***************************************************\n" \
-	          "** Libraries have been installed in $(LIBDIR).     \n" \
+	          "** Libraries have been installed in $(prefix)/lib. \n" \
 	          "** Don't forget to run ldconfig.                   \n" \
 	          "***************************************************"
 
 	@if test -f pcrsed@EXEEXT@; then\
 	  echo -e "\nRebuilding pcrsed to use the installed shared library"; \
-	  $(CC) $(CFLAGS) -L$(LIBDIR) pcrsed.c -o pcrsed@EXEEXT@ $(LIBS) -lpcrs; \
+	  $(CC) $(CFLAGS) -L$(prefix)/lib pcrsed.c -o pcrsed@EXEEXT@ $(LIBS) -lpcrs; \
 	fi
 
 clean: