diff options
| author | Denis Vlasenko | 2006-12-12 23:46:31 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-12-12 23:46:31 +0000 |
| commit | 5e2db5e8ee527ef35f3654fdeaac9a9efe7b9eb9 (patch) | |
| tree | f083d2194c476e68b222cb77e343ae135753e77b | |
| parent | 5fa7148761097d067c3f6723ca55c6284d1152ac (diff) | |
| download | busybox-5e2db5e8ee527ef35f3654fdeaac9a9efe7b9eb9.zip busybox-5e2db5e8ee527ef35f3654fdeaac9a9efe7b9eb9.tar.gz | |
build system: small fix for "release" target to work
| -rw-r--r-- | Makefile.custom | 8 | ||||
| -rw-r--r-- | libbb/recursive_action.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.custom b/Makefile.custom index 816bee5..e976e73 100644 --- a/Makefile.custom +++ b/Makefile.custom @@ -46,17 +46,17 @@ check test: busybox release: distclean cd ..; \ rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \ - cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && \ + cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \ find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \ -name .svn \ -print \ - -exec rm -r -f {} \; && \ + -exec rm -r -f {} \; ; \ find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \ -name .\#* \ -print \ - -exec rm -f {} \; && \ + -exec rm -f {} \; ; \ tar -czf busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION).tar.gz \ - busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/; + busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ ; } .PHONY: checkhelp checkhelp: diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index 05ff5d8..121a3df 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c @@ -93,6 +93,10 @@ int recursive_action(const char *fileName, dir = opendir(fileName); if (!dir) { + /* findutils-4.1.20 reports this */ + /* (i.e. it doesn't silently return with exit code 1) */ + /* To trigger: "find -exec rm -rf {} \;" */ + bb_perror_msg("%s", fileName); return FALSE; } status = TRUE; |