From 4ae81b0fee6f2b22781a91bcf6bc80a12fdb7258 Mon Sep 17 00:00:00 2001 From: stasinos Date: Sat, 13 Jan 2007 06:10:26 +0000 Subject: [PATCH] Fix mismatch between Makefile.in, configure.in and directory name wrt the matrices library. git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1775 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- Makefile.in | 8 ++++---- configure.in | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 75ad34304..06726a7eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -528,7 +528,7 @@ all: startup @INSTALL_DLLS@ (cd library/yap2swi; make) @INSTALL_DLLS@ (cd library/Tries; make) @INSTALL_DLLS@ (cd library/lammpi; make) - @INSTALL_DLLS@ (cd library/matrix; make) + @INSTALL_DLLS@ (cd library/matrices; make) @ENABLE_JPL@ @INSTALL_DLLS@ (cd LGPL/JPL/src; make) startup: yap@EXEC_SUFFIX@ $(PL_SOURCES) @@ -565,7 +565,7 @@ install_unix: startup libYap.a @INSTALL_DLLS@ (cd library/yap2swi; make install) @INSTALL_DLLS@ (cd library/Tries; make install) @INSTALL_DLLS@ (cd library/lammpi; make install) - @INSTALL_DLLS@ (cd library/matrix; make install) + @INSTALL_DLLS@ (cd library/matrices; make install) @ENABLE_JPL@ @INSTALL_DLLS@ (cd LGPL/JPL/src; make install) mkdir -p $(DESTDIR)$(INCLUDEDIR) for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done @@ -586,7 +586,7 @@ install_win32: startup for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done $(INSTALL) config.h $(INCLUDEDIR)/config.h (cd library/random; make install) - (cd library/matrix; make install) + (cd library/matrices; make install) (cd library/regex; make install) (cd library/system; make install) (cd library/yap2swi; make install) @@ -624,7 +624,7 @@ depend: $(HEADERS) $(C_SOURCES) clean: clean_docs rm -f *.o *~ *.BAK *.a - @INSTALL_DLLS@ (cd library/matrix; make clean) + @INSTALL_DLLS@ (cd library/matrices; make clean) @INSTALL_DLLS@ (cd library/random; make clean) @INSTALL_DLLS@ (cd library/regex; make clean) @INSTALL_DLLS@ (cd library/system; make clean) diff --git a/configure.in b/configure.in index 209ab9151..2fc0bccab 100644 --- a/configure.in +++ b/configure.in @@ -1271,7 +1271,7 @@ AC_DEFINE(GC_NO_TAGS,1) AC_DEFINE(USE_DL_MALLOC,1) fi -mkdir -p library/matrix +mkdir -p library/matrices mkdir -p library/mpi mkdir -p library/random mkdir -p library/regex @@ -1292,7 +1292,7 @@ mkdir -p LGPL/clp mkdir -p LGPL/clpr mkdir -p LGPL/chr -AC_OUTPUT(Makefile library/matrix/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile LGPL/clpr/Makefile library/lammpi/Makefile library/Tries/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap) +AC_OUTPUT(Makefile library/matrices/Makefile library/regex/Makefile library/system/Makefile library/random/Makefile library/yap2swi/Makefile library/mpi/Makefile .depend library/Makefile LGPL/chr/Makefile LGPL/chr/chr_swi_bootstrap.yap CLPBN/Makefile LGPL/clp/Makefile LGPL/clpr/Makefile library/lammpi/Makefile library/Tries/Makefile LGPL/JPL/Makefile LGPL/JPL/src/Makefile LGPL/JPL/java/Makefile LGPL/JPL/jpl_paths.yap) make depend