$NetBSD: patch-ag,v 1.7 2009/12/22 17:46:17 drochner Exp $

--- src/Makefile.in.orig	2009-06-03 12:32:49.000000000 +0000
+++ src/Makefile.in
@@ -240,7 +240,7 @@ BUILT_EXTRAS := graphics.h mxarray.h
 
 EXTRAS := ov-base-int.cc ov-base-mat.cc ov-base-diag.cc ov-base-scalar.cc graphics-props.cc
 
-EXTRA_OBJECTS := oct-errno.o octave.o builtins.o ops.o
+EXTRA_OBJECTS := oct-errno.o builtins.o ops.o
 
 INCLUDES_FOR_INSTALL := $(INCLUDES) $(EXTRAS) $(BUILT_EXTRAS)
 
@@ -357,8 +357,9 @@ libraries: $(LIBRARIES)
 
 $(LIBPRE)octinterp.$(LIBEXT): $(OBJECTS) $(XERBLA)
 	rm -f $@
-	$(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^
-	$(RANLIB) $@
+	${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \
+		$(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \
+		-version-info ${version:3.2.%=3:2:%} $(OCTINTERP_LINK_DEPS)
 
 $(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLPRE)octinterp.$(SHLEXT)
 	rm -f $@
@@ -366,9 +367,10 @@ $(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLP
 
 $(SHLPRE)octinterp.$(SHLEXT): $(PICOBJ) $(PIC_XERBLA)
 	rm -f $@
-	$(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
+	${LIBTOOL} --mode=link $(SH_LD) $(SH_LDFLAGS) $(SONAME_FLAGS) -o $@ $^ $(OCTINTERP_LINK_DEPS)
 
 octave$(EXEEXT): $(LIBRARIES) main.o $(DLD_STATIC_OBJ)
+	${LIBTOOL} --mode=link \
 	$(LD_CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(RDYNAMIC_FLAG) \
 	$(ALL_LDFLAGS) -o $@ \
 	main.o $(DLD_STATIC_OBJ) \
@@ -460,6 +462,7 @@ install-strip:
 install-bin:
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
 	rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT)
+	${LIBTOOL} --mode=install \
 	$(INSTALL_PROGRAM) octave$(EXEEXT) $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT)
 	cd $(DESTDIR)$(bindir) ; $(LN_S) octave-$(version)$(EXEEXT) octave$(EXEEXT)
 .PHONY: install-bin
@@ -470,6 +473,7 @@ install-oct:
 	if [ -n "$(OCT_FILES)" ]; then \
 	  xfiles="$(OCT_FILES)"; \
 	  for f in $$xfiles; do \
+	    ${LIBTOOL} --mode=install \
 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
 	  done; \
 	fi
@@ -479,9 +483,8 @@ install-lib:
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir)
 	if $(STATIC_LIBS); then \
 	  rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
-	  $(INSTALL_DATA) $(LIBPRE)octinterp.$(LIBEXT) \
-	    $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
-	  $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT); \
+	  ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} liboctinterp.$(LIBEXT) \
+		${DESTDIR}${PREFIX}/lib; \
 	fi
 	if $(SHARED_LIBS); then \
 	  rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB_VER); \
