--- lib/Makefile.in.orig	Sat Dec  4 06:49:27 1999
+++ lib/Makefile.in	Sat Apr  8 18:00:00 2000
@@ -4,9 +4,9 @@
 
 #----------------------------------------------------------------------------------
 
-all: shared
+all: static shared
 
-install: install-shared
+install: install-static install-shared
 
 static:  libEZ.a
 
@@ -92,31 +92,26 @@
 #----------------------------------------------------------------------------------
  
 OBJ =    $(SRC:.c=.o)
+SOBJ =   $(SRC:.c=.so)
 
-libEZ.so.$(MAJORVERSION): libEZ.so.$(MAJORVERSION).$(MINORVERSION)
+libEZ.so.$(MAJORVERSION): $(SOBJ)
 	- $(RMF) libEZ.so.$(MAJORVERSION)
-	$(LN) -s libEZ.so.$(MAJORVERSION).$(MINORVERSION) libEZ.so.$(MAJORVERSION)
+	$(CC) -shared -Wl,-soname,$@ -o $@ $(SOBJ)
 	- $(RMF) libEZ.so
-	$(LN) -s libEZ.so.$(MAJORVERSION) libEZ.so
-
-libEZ.so.$(MAJORVERSION).$(MINORVERSION): $(OBJ)
-	$(CC) -shared  -o libEZ.so.$(MAJORVERSION).$(MINORVERSION) $(OBJ)
-
+	$(LN) -sf $@ libEZ.so
 
 libEZ.a: $(OBJ) 
 	 $(AR) r libEZ.a $(OBJ) 
 	 $(RANLIB) libEZ.a
 
 install-shared: shared
-	$(CP) libEZ.so.$(MAJORVERSION).$(MINORVERSION)  $(destlibdir)
 	- $(RMF) $(destlibdir)/libEZ.so $(destlibdir)/libEZ.so.$(MAJORVERSION)
-	$(LN) -s  $(destlibdir)/libEZ.so.$(MAJORVERSION).$(MINORVERSION) $(destlibdir)/libEZ.so.$(MAJORVERSION)
-	$(LN) -s  $(destlibdir)/libEZ.so.$(MAJORVERSION) $(destlibdir)/libEZ.so
-	- (lldconfig >/dev/null || /sbin/ldconfig) 
+	$(INSTALL_DATA) libEZ.so.$(MAJORVERSION)  $(destlibdir)
+	$(LN) -sf  libEZ.so.$(MAJORVERSION) $(destlibdir)/libEZ.so
 
 
-install-static: shared
-	$(CP) libEZ.a $(destlibdir)
+install-static: static
+	$(INSTALL_DATA) libEZ.a $(destlibdir)
 	$(RANLIB) $(destlibdir)/libEZ.a
 
 clean:
@@ -137,12 +132,16 @@
 fnmatch.o: fnmatch.c
 	$(CC) $(LINC) $(CFLAGS) -c fnmatch.c
 
+.SUFFIXES: .c .so .o
+
 .c.o:
-	$(CC) $(LINC) $(XINC) $(CFLAGS) -c  $<
+	$(CC) $(LINC) $(XINC) $(CPPFLAGS) $(CFLAGS) -c  $<
 
+.c.so:
+	$(CC) $(LINC) $(XINC) $(CPPFLAGS) $(CFLAGS) -fpic -DPIC -c  $< -o $@
 
 .c:
-	$(CC) $(LINC) $(XINC) $(CFLAGS)  $< -o $@ -L./ -lEZ $(XLIB) $(LIBS)
+	$(CC) $(LINC) $(XINC) $(CPPFLAGS) $(CFLAGS) $< -o $@ -L./ -lEZ $(XLIB) $(LIBS)
 
 #----------------------------------------------------------------------------------