aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-12-12 23:46:31 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-12-12 23:46:31 +0000
commit5e2db5e8ee527ef35f3654fdeaac9a9efe7b9eb9 (patch)
treef083d2194c476e68b222cb77e343ae135753e77b
parent5fa7148761097d067c3f6723ca55c6284d1152ac (diff)
downloadbusybox-w32-5e2db5e8ee527ef35f3654fdeaac9a9efe7b9eb9.tar.gz
busybox-w32-5e2db5e8ee527ef35f3654fdeaac9a9efe7b9eb9.tar.bz2
busybox-w32-5e2db5e8ee527ef35f3654fdeaac9a9efe7b9eb9.zip
build system: small fix for "release" target to work
-rw-r--r--Makefile.custom8
-rw-r--r--libbb/recursive_action.c4
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.custom b/Makefile.custom
index 816bee5db..e976e739e 100644
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -46,17 +46,17 @@ check test: busybox
46release: distclean 46release: distclean
47 cd ..; \ 47 cd ..; \
48 rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \ 48 rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
49 cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && \ 49 cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
50 find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \ 50 find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
51 -name .svn \ 51 -name .svn \
52 -print \ 52 -print \
53 -exec rm -r -f {} \; && \ 53 -exec rm -r -f {} \; ; \
54 find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \ 54 find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
55 -name .\#* \ 55 -name .\#* \
56 -print \ 56 -print \
57 -exec rm -f {} \; && \ 57 -exec rm -f {} \; ; \
58 tar -czf busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION).tar.gz \ 58 tar -czf busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION).tar.gz \
59 busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/; 59 busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ ; }
60 60
61.PHONY: checkhelp 61.PHONY: checkhelp
62checkhelp: 62checkhelp:
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c
index 05ff5d84f..121a3dffd 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -93,6 +93,10 @@ int recursive_action(const char *fileName,
93 93
94 dir = opendir(fileName); 94 dir = opendir(fileName);
95 if (!dir) { 95 if (!dir) {
96 /* findutils-4.1.20 reports this */
97 /* (i.e. it doesn't silently return with exit code 1) */
98 /* To trigger: "find -exec rm -rf {} \;" */
99 bb_perror_msg("%s", fileName);
96 return FALSE; 100 return FALSE;
97 } 101 }
98 status = TRUE; 102 status = TRUE;