From aaa7c40696eb979b147d9e36d7d020df53c435b5 Mon Sep 17 00:00:00 2001 From: jcalcote Date: Mon, 20 Jul 2009 19:18:26 +0000 Subject: [PATCH] Made rpm build shell script handle errors a little better in all four sub-projects. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@1106 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/Makefile.am | 2 +- ftk/Makefile.am | 2 +- sql/Makefile.am | 2 +- xflaim/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flaim/Makefile.am b/flaim/Makefile.am index 40f2d95..21d59e0 100644 --- a/flaim/Makefile.am +++ b/flaim/Makefile.am @@ -14,7 +14,7 @@ RPM = rpm rpms srcrpm: dist (cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \ - test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch ) + test -z "$$rpmarch" || ( mv $$rpmarch/* . && rm -rf $$rpmarch ) rm -rf $(distdir) dist-hook: diff --git a/ftk/Makefile.am b/ftk/Makefile.am index 2ce1732..f7f1486 100644 --- a/ftk/Makefile.am +++ b/ftk/Makefile.am @@ -18,7 +18,7 @@ RPM = rpm rpms srcrpm: dist (cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \ - test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch ) + test -z "$$rpmarch" || ( mv $$rpmarch/* . && rm -rf $$rpmarch ) rm -rf $(distdir) dist-hook: diff --git a/sql/Makefile.am b/sql/Makefile.am index d66fdba..4e6d7f0 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -14,7 +14,7 @@ RPM = rpm rpms srcrpm: dist (cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \ - test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch ) + test -z "$$rpmarch" || ( mv $$rpmarch/* . && rm -rf $$rpmarch ) rm -rf $(distdir) dist-hook: diff --git a/xflaim/Makefile.am b/xflaim/Makefile.am index c2e15f4..b425ef7 100644 --- a/xflaim/Makefile.am +++ b/xflaim/Makefile.am @@ -14,7 +14,7 @@ RPM = rpm rpms srcrpm: dist (cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1 rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \ - test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch ) + test -z "$$rpmarch" || ( mv $$rpmarch/* . && rm -rf $$rpmarch ) rm -rf $(distdir) dist-hook: