From bc2b5977a52baff96ffd69b118967a82d5933555 Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Mon, 24 Sep 2012 09:50:44 +0200 Subject: Fix parallel build issues Prevent creating symbolic links in not yet created sbindir. Since lex creates two files, make them depend on each other to prevent race condition. Change-Id: I72b633b24de33407006d70571b0a40adaa99dc2b BUG: 859843 Signed-off-by: Kacper Kowalik (Xarthisius) Reviewed-on: http://review.gluster.org/3968 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- glusterfsd/src/Makefile.am | 1 + libglusterfs/src/Makefile.am | 1 + 2 files changed, 2 insertions(+) diff --git a/glusterfsd/src/Makefile.am b/glusterfsd/src/Makefile.am index 17d7a4a8139..152654fc134 100644 --- a/glusterfsd/src/Makefile.am +++ b/glusterfsd/src/Makefile.am @@ -25,6 +25,7 @@ uninstall-local: install-data-local: $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run $(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs + $(INSTALL) -d -m 755 $(DESTDIR)$(sbindir) rm -f $(DESTDIR)$(sbindir)/glusterfs rm -f $(DESTDIR)$(sbindir)/glusterd ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index 0921a290193..5edba293c7e 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -46,6 +46,7 @@ EXTRA_DIST = graph.l graph.y graph.lex.c: graph.l y.tab.h $(LEX) -t $(srcdir)/graph.l > $@ +y.tab.c: y.tab.h y.tab.h: graph.y $(YACC) -d $(srcdir)/graph.y -- cgit