--- libreadline-java-0.8.0/Makefile	2003-01-07 05:14:35.000000000 -0500
+++ libreadline-java-0.8.0-new/Makefile	2004-07-14 11:34:32.000000000 -0400
@@ -42,7 +42,7 @@
 DHEADER   = "<strong>$(NAME), Version $(VERSION)</strong>"
 DFOOTER   = "<strong>$(NAME), Version $(VERSION)</strong>"
 BIN_ADD   = $(README) $(NEWS) $(TODO) $(CHANGELOG) $(LICENSE) \
-             $(JAR) *.so $(APIDIR)
+             $(JAR) *.jnilib $(APIDIR)
 SRC_ADD   = $(README) $(NEWS) $(TODO) $(CHANGELOG) $(LICENSE) \
              Makefile VERSION $(SUBDIRS) contrib src etc
 MF_STUB   = etc/manifest.stub
@@ -105,9 +105,10 @@
                 -version -author org.gnu.readline test
 
 install: jar build-native apidoc
-	install -D $(JAR)    $(DESTDIR)$(JAVALIBDIR)/$(JAR)
+	install -d $(DESTDIR)$(JAVALIBDIR)/$(JAR)
+	install -c $(JAR)    $(DESTDIR)$(JAVALIBDIR)/$(JAR)
 	install -d $(DESTDIR)$(BINLIBDIR)
-	install  *.so        $(DESTDIR)$(BINLIBDIR)
+	install  *.jnilib    $(DESTDIR)$(BINLIBDIR)
 	install -d $(DESTDIR)$(DOCDIR)/$(TARGET)-$(VERSION)
 	cp -r api $(DESTDIR)$(DOCDIR)/$(TARGET)-$(VERSION)
 
@@ -146,4 +147,4 @@
 	$(MAKE) -C src/native clean
 	-rm -fr `find . -name "*.o" -o -name "*~"` \
 		$(JAR) $(TARGET)-*.tar.*z* $(APIDIR) \
-		$(BUILDDIR) *.so .rltest_history
+		$(BUILDDIR) *.jnilib .rltest_history
--- libreadline-java-0.8.0/src/native/Makefile	2003-01-07 05:14:35.000000000 -0500
+++ libreadline-java-0.8.0-new/src/native/Makefile	2004-07-14 11:38:27.000000000 -0400
@@ -45,7 +45,7 @@
 CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
 else
 INCLUDES          = -I $(JAVAINCLUDE) -I $(JAVANATINC)
-LIBPATH           = -L/usr/lib/termcap 
+LIBPATH           = -L/usr/lib/termcap  -L@INSTPREFIX@/lib
 JavaReadline_LIBS = -lreadline -ltermcap -lhistory
 JavaEditline_LIBS = -ledit -ltermcap
 ifeq (cygwin,$(WIN32))
@@ -54,7 +54,7 @@
 CC = gcc
 OBJ_EXT := o
 LIB_PRE := lib
-LIB_EXT := so
+LIB_EXT := jnilib
 CFLAGS=-fPIC -DPOSIX
 endif
 
@@ -97,7 +97,7 @@
 	$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
 		$(OBJECTS) -W1,-e,_readline_init@12
 else
-	$(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
+	$(CC) -install_name @INSTPREFIX@/lib/$(LIB_PRE)$(TG).$(LIB_EXT) -dynamiclib $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
 endif
 endif