From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 4 Aug 2006 14:14:39 +0000 (+0000)
Subject: corrected bug in recent commit which overwrote some samples makefiles in the distribution
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/568f139b15e7bffe3adf8793f0180331ff3a72d7?ds=sidebyside

corrected bug in recent commit which overwrote some samples makefiles in the distribution


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/Makefile.in b/Makefile.in
index 1a61a6b367..0bb476cd21 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27753,7 +27753,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	    t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
 	    mkdir -p $$t; \
 	    $(CP_P) $$s/Makefile.in \
-		    `find $$s -name 'makefile.*' -o -name descrip.mms -o \
+		    `find $$s -maxdepth 1 -name 'makefile.*' -o -name descrip.mms -o \
 				-name '*.cpp' -o -name '*.h' -o \
 				-name '*.bmp' -o -name '*.ico' -o -name '*.png' -o \
 				-name '*.rc' -o -name '*.xpm'` $$t; \
diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk
index 9ebe34dfcc..42e87e453f 100644
--- a/build/bakefiles/make_dist.mk
+++ b/build/bakefiles/make_dist.mk
@@ -522,7 +522,7 @@ SAMPLES_DIST: ALL_GUI_DIST
 	    t="$(DISTDIR)/samples/`echo $$s | sed 's@$(SAMPDIR)/@@'`"; \
 	    mkdir -p $$t; \
 	    $(CP_P) $$s/Makefile.in \
-		    `find $$s -name 'makefile.*' -o -name descrip.mms -o \
+		    `find $$s -maxdepth 1 -name 'makefile.*' -o -name descrip.mms -o \
 				-name '*.cpp' -o -name '*.h' -o \
 				-name '*.bmp' -o -name '*.ico' -o -name '*.png' -o \
 				-name '*.rc' -o -name '*.xpm'` $$t; \