1*4882a593SmuzhiyunFrom 6bbde84a2197c97e49d9e64118a979728209e436 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 3*4882a593SmuzhiyunDate: Wed, 23 Sep 2015 23:21:42 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Makefile.am: avoid race when creating autostart directories 5*4882a593SmuzhiyunMIME-Version: 1.0 6*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 7*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 8*4882a593Smuzhiyun 9*4882a593Smuzhiyunfixes: 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun| make: creating data/xsession/openbox-gnome-session 12*4882a593Smuzhiyun| make: creating data/xsession/openbox-session 13*4882a593Smuzhiyun| make: creating data/xsession/openbox-kde-session 14*4882a593Smuzhiyun| make: creating data/autostart/openbox-autostart 15*4882a593Smuzhiyun| make: creating doc/openbox.1 16*4882a593Smuzhiyun| make: creating data/autostart/autostart 17*4882a593Smuzhiyun| make: creating doc/openbox-session.1 18*4882a593Smuzhiyun| make: creating doc/openbox-gnome-session.1 19*4882a593Smuzhiyun| make: creating doc/openbox-kde-session.1 20*4882a593Smuzhiyun| make: creating doc/obxprop.1 21*4882a593Smuzhiyun| mkdir: cannot create directory './data/autostart': File exists 22*4882a593Smuzhiyun| Makefile:4329: recipe for target 'data/autostart/autostart' failed 23*4882a593Smuzhiyun 24*4882a593SmuzhiyunUpstream-Status: Pending 25*4882a593Smuzhiyun 26*4882a593SmuzhiyunSigned-off-by: Andreas Müller <schnitzeltony@googlemail.com> 27*4882a593Smuzhiyun--- 28*4882a593Smuzhiyun Makefile.am | 6 ++---- 29*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 4 deletions(-) 30*4882a593Smuzhiyun 31*4882a593Smuzhiyundiff --git a/Makefile.am b/Makefile.am 32*4882a593Smuzhiyunindex f25bf8e..306e77d 100644 33*4882a593Smuzhiyun--- a/Makefile.am 34*4882a593Smuzhiyun+++ b/Makefile.am 35*4882a593Smuzhiyun@@ -505,14 +505,12 @@ edit = $(SED) \ 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun data/autostart/autostart: $(top_srcdir)/data/autostart/autostart.in Makefile 38*4882a593Smuzhiyun @echo make: creating $@ 39*4882a593Smuzhiyun- @test -d $(shell dirname $(top_builddir)/$@) || \ 40*4882a593Smuzhiyun- mkdir $(shell dirname $(top_builddir)/$@) 41*4882a593Smuzhiyun+ mkdir -p $(shell dirname $(top_builddir)/$@) 42*4882a593Smuzhiyun @$(edit) $< >$(top_builddir)/$@ 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun data/autostart/openbox-autostart: $(top_srcdir)/data/autostart/openbox-autostart.in Makefile 45*4882a593Smuzhiyun @echo make: creating $@ 46*4882a593Smuzhiyun- @test -d $(shell dirname $(top_builddir)/$@) || \ 47*4882a593Smuzhiyun- mkdir $(shell dirname $(top_builddir)/$@) 48*4882a593Smuzhiyun+ mkdir -p $(shell dirname $(top_builddir)/$@) 49*4882a593Smuzhiyun @$(edit) $< >$(top_builddir)/$@ 50*4882a593Smuzhiyun 51*4882a593Smuzhiyun %.desktop: %.desktop.in Makefile 52*4882a593Smuzhiyun-- 53*4882a593Smuzhiyun2.1.0 54*4882a593Smuzhiyun 55