From b950197da1e0a53c7d220dd666ff3afbb61a1f18 Mon Sep 17 00:00:00 2001 From: "Anthony J. Bentley" Date: Fri, 4 Apr 2014 16:39:03 -0600 Subject: [PATCH 1/2] Remove non-POSIX 'rm -v'. --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 45bdc47ac..69fbf5222 100644 --- a/Makefile +++ b/Makefile @@ -176,11 +176,11 @@ manual: $(TARGETS) $(EXTRA_TARGETS) cd manual && bash manual.sh clean: - rm -rvf share + rm -rf share cd manual && bash clean.sh - rm -vf $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) - rm -vf kernel/version_*.o kernel/version_*.cc abc/abc-[0-9a-f]* - rm -vf libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d techlibs/*/*.d + rm -f $(OBJS) $(GENFILES) $(TARGETS) $(EXTRA_TARGETS) + rm -f kernel/version_*.o kernel/version_*.cc abc/abc-[0-9a-f]* + rm -f libs/*/*.d frontends/*/*.d passes/*/*.d backends/*/*.d kernel/*.d techlibs/*/*.d test ! -f libs/svgviewer/Makefile || make -C libs/svgviewer distclean mrproper: clean From 66a5da5edc41a2b33413c965337001bb179d30f6 Mon Sep 17 00:00:00 2001 From: "Anthony J. Bentley" Date: Fri, 4 Apr 2014 16:51:27 -0600 Subject: [PATCH 2/2] POSIX find requires a path argument. --- libs/minisat/UPDATE.sh | 2 +- manual/clean.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/minisat/UPDATE.sh b/libs/minisat/UPDATE.sh index 539ee23f8..a84290279 100644 --- a/libs/minisat/UPDATE.sh +++ b/libs/minisat/UPDATE.sh @@ -1,6 +1,6 @@ #!/bin/bash -rm -fv LICENSE *.cc *.h +rm -f LICENSE *.cc *.h git clone --depth 1 https://github.com/niklasso/minisat minisat_upstream rm minisat_upstream/minisat/*/Main.cc mv minisat_upstream/LICENSE minisat_upstream/minisat/*/*.{h,cc} . diff --git a/manual/clean.sh b/manual/clean.sh index 13554c01b..f4a2ea83a 100755 --- a/manual/clean.sh +++ b/manual/clean.sh @@ -1,2 +1,2 @@ #!/bin/bash -for f in $( find -name .gitignore ); do sed -re "s,^,find ${f%.gitignore} -name ',; s,$,' | xargs -r rm -vf,;" $f; done | bash -v +for f in $( find . -name .gitignore ); do sed -re "s,^,find ${f%.gitignore} -name ',; s,$,' | xargs -r rm -f,;" $f; done | bash -v