diff options
| author | Kacper Kowalik (Xarthisius) <xarthisius.kk@gmail.com> | 2012-09-24 09:50:44 +0200 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-09-26 11:17:02 -0700 |
| commit | bc2b5977a52baff96ffd69b118967a82d5933555 (patch) | |
| tree | 4dae5cbe6851e9f41f31f7249dd3e605a5f1fca4 | |
| parent | 36db38a5722127e9f330915783cddae453be5db3 (diff) | |
| download | glusterfs-bc2b5977a52baff96ffd69b118967a82d5933555.tar.gz glusterfs-bc2b5977a52baff96ffd69b118967a82d5933555.tar.xz glusterfs-bc2b5977a52baff96ffd69b118967a82d5933555.zip | |
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) <xarthisius.kk@gmail.com>
Reviewed-on: http://review.gluster.org/3968
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | glusterfsd/src/Makefile.am | 1 | ||||
| -rw-r--r-- | libglusterfs/src/Makefile.am | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/glusterfsd/src/Makefile.am b/glusterfsd/src/Makefile.am index 17d7a4a813..152654fc13 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 0921a29019..5edba293c7 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 |