--- electric-fence-2.1.13/Makefile.orig	2007-08-15 11:19:25.471321735 +0700
+++ electric-fence-2.1.13/Makefile	2007-08-15 11:30:07.649154986 +0700
@@ -1,12 +1,9 @@
-ASFLAGS= -mips2
-CC= cc
 AR= ar
 INSTALL= install
 MV= mv
 CHMOD= chmod
-CFLAGS= -g
-LIB_INSTALL_DIR= /usr/lib
-MAN_INSTALL_DIR= /usr/man/man3
+LIBDIR ?= /usr/lib
+MANDIR ?= /usr/share/man
 
 PACKAGE_SOURCE= README libefence.3 Makefile efence.h \
 	efence.c page.c print.c eftest.c tstheap.c CHANGES COPYING
@@ -28,21 +25,21 @@
 
 OBJECTS= efence.o page.o print.o
 
-all:	libefence.a tstheap eftest
+all:	libefence.so tstheap eftest
 	@ echo
 	@ echo "Testing Electric Fence."
 	@ echo "After the last test, it should print that the test has PASSED."
-	./eftest
-	./tstheap 3072
+	LD_LIBRARY_PATH=. ./eftest
+	LD_LIBRARY_PATH=. ./tstheap 3072
 	@ echo
 	@ echo "Electric Fence confidence test PASSED." 
 	@ echo
 
-install: libefence.a libefence.3
-	$(MV) libefence.a $(LIB_INSTALL_DIR)
-	$(CHMOD) 644 $(LIB_INSTALL_DIR)/libefence.a
-	$(INSTALL) libefence.3 $(MAN_INSTALL_DIR)/libefence.3
-	$(CHMOD) 644 $(MAN_INSTALL_DIR)/libefence.3
+install: libefence.so libefence.3
+	mkdir -p $(DESTDIR)$(LIBDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man3
+	$(INSTALL) -c -m 0755 libefence.so $(DESTDIR)$(LIBDIR)/libefence.so
+	$(INSTALL) -c -m 0644 libefence.3 $(DESTDIR)$(MANDIR)/man3/libefence.3
 
 clean:
 	- rm -f $(OBJECTS) tstheap.o eftest.o tstheap eftest libefence.a \
@@ -57,16 +54,16 @@
 
 shar: ElectricFence.shar
 
-libefence.a: $(OBJECTS)
-	- rm -f libefence.a
-	$(AR) crv libefence.a $(OBJECTS)
+libefence.so: $(OBJECTS)
+	- rm -f libefence.so
+	$(CC) -G $(CFLAGS) -o libefence.so $(OBJECTS)
 
-tstheap: libefence.a tstheap.o
+tstheap: libefence.so tstheap.o
 	- rm -f tstheap
-	$(CC) $(CFLAGS) tstheap.o libefence.a -o tstheap -lpthread
+	$(CC) $(CFLAGS) tstheap.o -L. -lefence -o tstheap -lpthread
 
-eftest: libefence.a eftest.o
+eftest: libefence.so eftest.o
 	- rm -f eftest
-	$(CC) $(CFLAGS) eftest.o libefence.a -o eftest -lpthread
+	$(CC) $(CFLAGS) eftest.o -L. -lefence -o eftest -lpthread
 
 $(OBJECTS) tstheap.o eftest.o: efence.h
--- electric-fence-2.1.13/page.c.orig	2007-08-15 11:17:00.748205765 +0700
+++ electric-fence-2.1.13/page.c	2007-08-15 11:18:42.019603599 +0700
@@ -39,7 +39,7 @@
 {
 #if ( defined(sgi) )
 	return strerror(oserror());
-#elif ( defined(_AIX) )
+#elif ( defined(_AIX) || defined(sun))
 	return strerror(errno);
 #else
 	if ( errno > 0 && errno < sys_nerr )