Mercurial > hg > octave-shane
changeset 9189:8a348e4be8bb
repair damage done when applying changeset 49a0c58a7dcf
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 07 May 2009 18:01:48 -0400 |
parents | 9646be3a59c4 |
children | 7a10410db2c6 |
files | Makeconf.in configure.in libcruft/Makefile.in liboctave/Makefile.in src/Makefile.in |
diffstat | 5 files changed, 23 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/Makeconf.in +++ b/Makeconf.in @@ -102,6 +102,7 @@ LIBEXT = a LIBPRE = @LIBPRE@ SHLPRE = @SHLPRE@ +SHLLIBPRE = @SHLLIBPRE@ SHLBINPRE = @SHLBINPRE@ # Fortran compiler flags.
--- a/configure.in +++ b/configure.in @@ -1192,6 +1192,7 @@ SHLLINKEXT= LIBPRE=lib SHLPRE=lib +SHLLIBPRE=lib SHLBINPRE=lib SH_LD='$(CXX)' SH_LDFLAGS=-shared @@ -1282,6 +1283,7 @@ SHLBIN=dll LIBPRE= SHLPRE= + SHLLIBPRE= SHLBINPRE= SH_LDFLAGS="-shared" if test -n "`echo $CFLAGS | grep -e '-g'`" -o -n "`echo $CXXFLAGS | grep -e '-g'`"; then @@ -1398,6 +1400,7 @@ AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE]) AC_MSG_NOTICE([defining SHLPRE to be $SHLPRE]) +AC_MSG_NOTICE([defining SHLLIBPRE to be $SHLLIBPRE]) AC_MSG_NOTICE([defining SHLBINPRE to be $SHLBINPRE]) AC_MSG_NOTICE([defining SH_LD to be $SH_LD]) AC_MSG_NOTICE([defining SH_LDFLAGS to be $SH_LDFLAGS]) @@ -1426,6 +1429,7 @@ AC_SUBST(SHLLINKEXT) AC_SUBST(LIBPRE) AC_SUBST(SHLPRE) +AC_SUBST(SHLLIBPRE) AC_SUBST(SHLBINPRE) AC_SUBST(SH_LD) AC_SUBST(SH_LDFLAGS)
--- a/libcruft/Makefile.in +++ b/libcruft/Makefile.in @@ -152,12 +152,12 @@ $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) ; \ fi if $(SHARED_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)cruft.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB_VER); \ $(INSTALL) \ - $(SHLPRE)cruft.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(SHLPRE)cruft.$(SHLLIB_VER); \ - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)cruft.$(SHLLIB); \ + $(SHLLIBPRE)cruft.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB); \ (cd $(DESTDIR)$(octlibdir); \ - $(LN_S) $(SHLPRE)cruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(SHLPRE)cruft.$(SHLLIB)); \ + $(LN_S) $(SHLLIBPRE)cruft.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB)); \ if test x$(SHLBIN) != x ; then \ rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)cruft.$(SHLBIN); \ $(INSTALL_PROGRAM) \ @@ -170,8 +170,8 @@ uninstall:: rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)cruft.$(LIBEXT) - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)cruft.$(SHLLIB) - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)cruft.$(SHLLIB_VER) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)cruft.$(SHLLIB_VER) if test x$(SHLBIN) != x; then \ rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)cruft.$(SHLBIN); \ rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)cruft.$(SHLBIN_VER); \
--- a/liboctave/Makefile.in +++ b/liboctave/Makefile.in @@ -303,11 +303,11 @@ $(RANLIB) $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT); \ fi if $(SHARED_LIBS); then \ - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)octave.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB_VER); \ $(INSTALL) \ - $(SHLPRE)octave.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(SHLPRE)octave.$(SHLLIB_VER); \ - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)octave.$(SHLLIB); \ - (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(SHLPRE)octave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(SHLPRE)octave.$(SHLLIB)); \ + $(SHLLIBPRE)octave.$(SHLLIB) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB); \ + (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(SHLLIBPRE)octave.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB)); \ if test x$(SHLBIN) != x ; then \ rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octave.$(SHLBIN); \ $(INSTALL_PROGRAM) \ @@ -330,8 +330,8 @@ uninstall: rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octave.$(LIBEXT) - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)octave.$(SHLLIB) - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)octave.$(SHLLIB_VER) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octave.$(SHLLIB_VER) if test x$(SHLBIN) != x; then \ rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octave.$(SHLBIN); \ rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octave.$(SHLBIN_VER); \
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -485,10 +485,10 @@ fi if $(SHARED_LIBS); then \ rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)octinterp.$(SHLEXT_VER); \ - $(INSTALL) $(SHLPRE)octinterp.$(SHLLIB) \ - $(DESTDIR)$(octlibdir)/$(SHLPRE)octinterp.$(SHLLIB_VER); \ - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)octinterp.$(SHLLIB); \ - (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(SHLPRE)octinterp.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(SHLPRE)octinterp.$(SHLLIB)); \ + $(INSTALL) $(SHLLIBPRE)octinterp.$(SHLLIB) \ + $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB_VER); \ + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB); \ + (cd $(DESTDIR)$(octlibdir) ; $(LN_S) $(SHLLIBPRE)octinterp.$(SHLLIB_VER) $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB)); \ if test x$(SHLBIN) != x ; then \ rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octinterp.$(SHLBIN); \ $(INSTALL_PROGRAM) \ @@ -521,8 +521,8 @@ rm -f $(DESTDIR)$(bindir)/octave$(EXEEXT) rm -f $(DESTDIR)$(bindir)/octave-$(version)$(EXEEXT) rm -f $(DESTDIR)$(octlibdir)/$(LIBPRE)octinterp.$(LIBEXT) - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)octinterp.$(SHLLIB) - rm -f $(DESTDIR)$(octlibdir)/$(SHLPRE)octinterp.$(SHLLIB_VER) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB) + rm -f $(DESTDIR)$(octlibdir)/$(SHLLIBPRE)octinterp.$(SHLLIB_VER) if test x$(SHLBIN) != x ; then \ rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octinterp.$(SHLBIN); \ rm -f $(DESTDIR)$(bindir)/$(SHLBINPRE)octinterp.$(SHLBIN_VER); \