Приступы некрофилии или CAD для ненавистников

diff --git a/Makefile b/Makefile
index 6c2f3b6..d8d86c7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,12 @@
-MANDIR=/usr/local/man/man1p
-BINDIR=/usr/local/bin
-LIBDIR=/usr/local/lib/piglet
+#MANDIR=/usr/local/man/man1p
+#BINDIR=/usr/local/bin
+#LIBDIR=/usr/local/lib/piglet
+
+PREFIX?=/usr/local
+MANDIR=$(PREFIX)/share/man/man1p
+BINDIR=$(PREFIX)/bin
+LIBDIR=$(PREFIX)/lib/piglet
+
 
 # for Fedora core 3, x-64:
 #XLIB=-lX11 -L/usr/X11R6/lib64
@@ -43,7 +49,7 @@ MANS=man/commandlist man/makemans man/seealso
 
 #CC=cc -pg -ggdb -Wall 		# profiling
 #CC=cc -p -O0 -ggdb -Wall	# valgrind
-CC=cc -ggdb -Wall
+CC=cc -ggdb -Wall -DLIBDIR=\"$(LIBDIR)\"
 
 # we currently make pig.bin, and then run the binary under the
 # wrapper "pig" which catches and error backtrace with gdb
@@ -89,6 +95,7 @@ install: man/piglet.1p pig.bin
 	@echo "########################################################"
 	mkdir -p $(MANDIR)
 	cp man/*1p $(MANDIR)
+	mkdir -p $(BINDIR)
 	-mv $(BINDIR)/pig.bin $(BINDIR)/pig.bin.bak
 	cp pig.bin  $(BINDIR)
 	cp pig  $(BINDIR)
diff --git a/db.c b/db.c
index 52c1a95..ad05a89 100644
--- a/db.c
+++ b/db.c
@@ -25,7 +25,7 @@
 #define BB 2		/* draw bounding box and don't do xform */
 
 
-char *PIG_PATH="./cells:.:./.pigrc:~/.pigrc:/usr/local/lib/piglet:/usr/lib/piglet";
+char *PIG_PATH="./cells:.:./.pigrc:~/.pigrc:" LIBDIR ":/usr/local/lib/piglet:/usr/lib/piglet";
 
 
 /* master symbol table pointers */
diff --git a/pigrc b/pigrc
index 006f267..318f788 100644
--- a/pigrc
+++ b/pigrc
@@ -2,7 +2,7 @@ $$
 $$ piglet initialization file
 $$ 
 
-SET PIG_PATH ".:./.pigrc:~/.pigrc:/usr/local/lib/piglet:/usr/lib/piglet";
+$$ SET PIG_PATH ".:./.pigrc:~/.pigrc:/usr/local/lib/piglet:/usr/lib/piglet";
 $$ SET PIG_RC "pigrc"   	      $$ I suppose if you wanted to
 
 SET PIG_GEOMETRY "700x440+10+30";     $$ set X11 geometry

make PREFIX=${HOME}/build/piglet && make PREFIX=${HOME}/build/piglet install