--- lib/Makefile.orig	Mon Nov 16 22:43:35 1998
+++ lib/Makefile	Sun Feb 21 20:21:48 1999
@@ -19,7 +19,13 @@
 
 static:  libEZ.a
 
-shared: libEZ.so.1.4
+.if ${PORTOBJFORMAT} == "elf"
+SOLIB= libEZ.so.1
+.else
+SOLIB= libEZ.so.1.4
+.endif
+
+shared: $(SOLIB)
 
 #----------------------------------------------------------------------------------
 
@@ -94,20 +100,24 @@
 OBJ =    $(SRC:.c=.o)
 
 libEZ.so.1.4: $(OBJ)
-	$(CC) -shared  -o libEZ.so.1.4 $(OBJ) ../jpeg/*.o
+	$(CC) -shared  -o libEZ.so.1.4 $(OBJ)
 	- /bin/rm -f libEZ.so libEZ.so.1
 	ln -s libEZ.so.1.4 libEZ.so
 	ln -s libEZ.so.1.4 libEZ.so.1
 
+libEZ.so.1: $(OBJ)
+	$(CC) -shared -Wl,-soname,$@ -o $@ $(OBJ)
+	- /bin/rm -f libEZ.so
+	ln -sf $@ libEZ.so
+
 libEZ.a: $(OBJ) 
-	 $(AR) r libEZ.a $(OBJ) ../jpeg/*.o
+	 $(AR) r libEZ.a $(OBJ)
 	 $(RANLIB) libEZ.a
 
 install-shared: shared
-	cp libEZ.so.1.4  $(LIBDIR)
-	- /bin/rm -f $(LIBDIR)/libEZ.so $(LIBDIR)/libEZ.so.1
-	ln -s  $(LIBDIR)/libEZ.so.1.4 $(LIBDIR)/libEZ.so
-	ln -s  $(LIBDIR)/libEZ.so.1.4 $(LIBDIR)/libEZ.so.1
+	cp $(SOLIB) $(LIBDIR)
+	- /bin/rm -f $(LIBDIR)/libEZ.so
+	ln -s  $(LIBDIR)/$(SOLIB) $(LIBDIR)/libEZ.so
 	- (lldconfig >/dev/null || /sbin/ldconfig) 
 
 install-static: shared
@@ -127,7 +137,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  $<
