--- lib/Makefile.orig	Wed Jun 24 17:03:23 1998
+++ lib/Makefile	Sat Oct  3 15:20:40 1998
@@ -19,7 +19,13 @@
 
 static:  libEZ.a
 
-shared: libEZ.so.1.3
+.if ${PORTOBJFORMAT} == "elf"
+SOLIB=	libEZ.so.1
+.else
+SOLIB=	libEZ.so.1.3
+.endif
+
+shared: $(SOLIB)
 
 #----------------------------------------------------------------------------------
 
@@ -98,15 +104,19 @@
 	ln -s libEZ.so.1.3 libEZ.so
 	ln -s libEZ.so.1.3 libEZ.so.1
 
+libEZ.so.1: $(OBJ)
+	$(CC) -shared -soname $@ -o $@ $(OBJ) 
+	- /bin/rm -f libEZ.so
+	ln -s $@ libEZ.so
+
 libEZ.a: $(OBJ) 
 	 $(AR) r libEZ.a $(OBJ)
 	 $(RANLIB) libEZ.a
 
 install-shared: shared
-	cp libEZ.so.1.3  $(LIBDIR)
-	- /bin/rm -f $(LIBDIR)/libEZ.so $(LIBDIR)/libEZ.so.1
-	ln -s  $(LIBDIR)/libEZ.so.1.3 $(LIBDIR)/libEZ.so
-	ln -s  $(LIBDIR)/libEZ.so.1.3 $(LIBDIR)/libEZ.so.1
+	cp $(SOLIB) $(LIBDIR)
+	- /bin/rm -f $(LIBDIR)/libEZ.so
+	ln -s  $(LIBDIR)/$(SOLIB) $(LIBDIR)/libEZ.so
 	(ldconfig >/dev/null || /sbin/ldconfig) 
 
 install-static: shared
@@ -126,7 +136,7 @@
 	$(CC) $(GLOB_OPTIONS) -c fnmatch.c
 
 EZ_Jpeg.o: EZ_Jpeg.c EZ_Widget.h
-	$(CC) -I$(JPEGDIR) -c  EZ_Jpeg.c
+	$(CC) -c  EZ_Jpeg.c
 
 .c.o:
 	$(CC) -c  $<
