From fe36320b478a4d14f3aa9e290bab817437a0c071 Mon Sep 17 00:00:00 2001 From: Vitor Santos Costa Date: Sun, 24 Oct 2010 21:30:42 +0200 Subject: [PATCH] When running 'make install' packages/jpl suffers from a race condition: * install_unix rule calls: - cd packages/jpl ; make - cd packages/jpl ; make install <-- race * install_data rule calls: - cd packages/jpl ; make install <-- race I've attached a patch that separate the jpl 'make' from the jpl 'make install' and ensures the jpl 'make install' is called from a single Makefile rule. Thanks Keri --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index be75d0621..6f0bb5e64 100755 --- a/Makefile.in +++ b/Makefile.in @@ -517,6 +517,7 @@ all: startup.yss @ENABLE_CPLINT@ (cd packages/cplint/approx/simplecuddLPADs; $(MAKE)) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE)) @USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE)) + @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) startup.yss: yap@EXEC_SUFFIX@ $(PL_SOURCES) -rm -f startup.yss @@ -568,7 +569,6 @@ install_unix: startup.yss libYap.a @INSTALL_DLLS@ (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@) @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) @INSTALL_MATLAB@ (cd library/matlab; $(MAKE) install) - @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE)) @ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/jpl; $(MAKE) install) #@ENABLE_JPL@ @INSTALL_DLLS@ (cd packages/pyswip; $(MAKE) install) mkdir -p $(DESTDIR)$(INCLUDEDIR) @@ -619,6 +619,7 @@ install_win32: startup.yss (cd packages/sgml; $(MAKE) install) (cd packages/semweb; $(MAKE) install) (cd packages/zlib; $(MAKE) @ZLIB_INSTALL@) + @ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install) @USE_MINISAT@ (cd packages/swi-minisat2/C; $(MAKE) install) @ENABLE_CPLINT@ (cd packages/cplint; $(MAKE) install) @USE_CUDD@ (cd packages/ProbLog/simplecudd; $(MAKE) install) @@ -632,7 +633,6 @@ install_data: (cd packages/swi-minisat2; $(MAKE) install) (cd LGPL ; $(MAKE) install) (cd GPL ; $(MAKE) install) - @ENABLE_JPL@ (cd packages/jpl ; $(MAKE) install) $(INSTALL_DATA) $(srcdir)/LGPL/pillow/icon_address.pl $(DESTDIR)$(SHAREDIR)/Yap/ $(INSTALL_DATA) $(srcdir)/LGPL/pillow/pillow.pl $(DESTDIR)$(SHAREDIR)/Yap/ @INSTALLCLP@(cd LGPL/clp ; $(MAKE) install)