From d5cbcec97ddefa0815853bd11cc612dc58ef7f3e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 13 Oct 2010 22:53:50 +0000 Subject: [PATCH] Skip Windows-only samples when making Unix distribution. Some samples are by definition Windows-only so they don't have Makefile.in files for Unix at all, skip them when creating the Unix distribution to avoid errors due to attempts to copy non-existent files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/make_dist.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 8650c7496e..1b16e2e179 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -570,9 +570,12 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/sample.* $(DISTDIR)/samples $(CP_P) $(SAMPDIR)/samples.* $(DISTDIR)/samples - # copy files common to all samples in a general way + # copy files common to all samples in a general way (samples without + # Makefile.in in them are Windows-specific and shouldn't be included in + # Unix distribution) for s in `find $(SAMPDIR) $(SAMPDIR)/html $(SAMPDIR)/opengl \ -mindepth 1 -maxdepth 1 -type d -not -name .svn`; do \ + if [ ! -f $$s/Makefile.in ]; then continue; fi; \ t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \ mkdir -p $$t; \ $(CP_P) $$s/Makefile.in \