diff options
Diffstat (limited to 'math/octave-current/patches/patch-af')
| -rw-r--r-- | math/octave-current/patches/patch-af | 79 |
1 files changed, 22 insertions, 57 deletions
diff --git a/math/octave-current/patches/patch-af b/math/octave-current/patches/patch-af index 20e6837bd61..96c9ab47fea 100644 --- a/math/octave-current/patches/patch-af +++ b/math/octave-current/patches/patch-af @@ -1,63 +1,28 @@ -$NetBSD: patch-af,v 1.3 2001/04/22 22:58:47 jtb Exp $ +$NetBSD: patch-af,v 1.4 2003/12/04 11:15:37 adam Exp $ ---- liboctave/Makefile.in.orig Sun Apr 22 20:22:11 2001 -+++ liboctave/Makefile.in Sun Apr 22 20:47:03 2001 -@@ -18,7 +18,7 @@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ +--- liboctave/Makefile.in.orig 2003-11-15 03:01:46.000000000 +0100 ++++ liboctave/Makefile.in +@@ -204,8 +204,9 @@ endif --LIBOCTAVE_LFLAGS = -L../libcruft -L../readline -L../kpathsea \ -+LIBOCTAVE_LFLAGS = -L../libcruft -L${LOCALBASE}/lib -L../kpathsea \ - -L../glob -L. $(RLD_FLAG) - - LIBOCTAVE_LIBS = -lcruft -lreadline -lkpathsea -lglob -@@ -146,25 +146,11 @@ - mkdir pic; \ - fi - --ifeq ($(SHARED_LIBS), true) -- ifeq ($(STATIC_LIBS), true) -- libraries: liboctave.$(LIBEXT) liboctave.$(SHLEXT) -- else -- libraries: liboctave.$(SHLEXT) -- endif --else -- ifeq ($(STATIC_LIBS), true) -- libraries: liboctave.$(LIBEXT) -- else -- libraries: -- endif --endif -+libraries: liboctave.$(LIBEXT) - .PHONY: libraries - - liboctave.$(LIBEXT): $(OBJECTS) -- rm -f $@ -- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $^ + liboctave.$(LIBEXT): $(LIBOCTAVE_OBJECTS) + rm -f $@ +- $(TEMPLATE_AR) $(TEMPLATE_ARFLAGS) $@ $(LIBOCTAVE_OBJECTS) - $(RANLIB) $@ -+ ${LIBTOOL} --mode=link cc -o liboctave.${LIBEXT} ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info ${version:2.1.%=2:%} ++ ${LIBTOOL} --mode=link ${CC} -o liboctave.$(LIBEXT) \ ++ $(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \ ++ -version-info ${version:2.1.%=2:%} - liboctave.$(SHLEXT): liboctave.$(SHLEXT_VER) + liboctave.$(SHLEXT_VER): liboctave.$(SHLEXT) rm -f $@ -@@ -188,20 +174,7 @@ - - install-lib: - $(top_srcdir)/mkinstalldirs $(octlibdir) -- if $(STATIC_LIBS); then \ -- rm -f $(octlibdir)/liboctave.$(LIBEXT); \ +@@ -232,9 +233,8 @@ install-lib: + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(octlibdir) + if $(STATIC_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ - $(INSTALL_DATA) liboctave.$(LIBEXT) \ -- $(octlibdir)/liboctave.$(LIBEXT); \ -- $(RANLIB) $(octlibdir)/liboctave.$(LIBEXT); \ -- fi -- if $(SHARED_LIBS); then \ -- rm -f $(octlibdir)/liboctave.$(SHLEXT_VER); \ -- $(INSTALL_PROGRAM) \ -- liboctave.$(SHLEXT_VER) $(octlibdir)/liboctave.$(SHLEXT_VER); \ -- cd $(octlibdir); \ -- rm -f liboctave.$(SHLEXT); \ -- $(LN_S) liboctave.$(SHLEXT_VER) liboctave.$(SHLEXT); \ -- fi -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} liboctave.${LIBEXT} ${PREFIX}/lib - $(mk-libdir-link) - .PHONY: install-lib - +- $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ +- $(RANLIB) $(DESTDIR)$(octlibdir)/liboctave.$(LIBEXT); \ ++ ${LIBTOOL} --mode=install $(INSTALL_DATA) liboctave.$(LIBEXT) \ ++ ${PREFIX}/lib; \ + fi + if $(SHARED_LIBS); then \ + rm -f $(DESTDIR)$(octlibdir)/liboctave.$(SHLLIB_VER); \ |