Changeset 2104 for trunk/server

Timestamp:

Dec 31, 2011, 9:46:10 PM (12 years ago)

Author:

andersk

Message:

Makefile: Make multiline statements fail on error

Also stop pointlessly hiding the commands being executed.

File:

• trunk/server/fedora/Makefile (modified) (8 diffs)

trunk/server/fedora/Makefile

@@ -48 +48 @@
 
 info:
-        @echo "The following packages are available:"; \
-        echo "$(allsrc)"; \
-        echo "Run 'make all' to build all packages."
+        @echo "The following packages are available:"
+        @echo "$(allsrc)"
+        @echo "Run 'make all' to build all packages."
 
 minimal-clean:
@@ -60 +60 @@
 
 mkdir-tree:
-        @rpmdev-setuptree
+        rpmdev-setuptree
         mkdir -p $(out_sbin)
         ln -sTf $(topdir) rpmbuild
@@ -66 +66 @@
 download: download_stamp
 download_stamp:
-        @mkdir -p $(dload); \
+        mkdir -p $(dload)
         #wget -qO- -nv $(server_url)/$(server_arch) | xargs make
         cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
@@ -86 +86 @@
 
 copy-patches: mkdir-tree
-        @cp $(patches)/*.patch $(tmp_src); \
-        cd $(tmp_src);
+        cp $(patches)/*.patch $(tmp_src)
 
 install-srpms: mkdir-tree download
-        rpm $(rpm_args) -i $(dload)/*.src.rpm 2>/dev/null;
+        rpm $(rpm_args) -i $(dload)/*.src.rpm 2>/dev/null
 
 copy-specs: mkdir-tree
@@ -97 +96 @@
 # Remove old .orig files so we're not mislead
 patch-specs: install-srpms
-        @cd ${tmp_specs}; \
+        @set -ex; \
+        cd ${tmp_specs}; \
         list=`ls ${specs}/*.spec.patch`; \
         rm -f *.orig; \
@@ -114 +114 @@
                         -e "s/SVNVERSION_TO_UPDATE/$${version}/" \
                 ${tmp_specs}/$$base.spec; \
-        done;
+        done
 
 # 1. use the package's Makefile to delete leftover files and run autoconf
 # 2. create a tarball (we want it to contain the autoconf output)
 tarballs: mkdir-tree
-        @cd ${oursrcdir}; \
+        @set -ex; \
+        cd ${oursrcdir}; \
         list=`find -mindepth 1 -maxdepth 1 -type d | grep -v ".svn"`; \
         for i in $$list; do \
@@ -131 +132 @@
                 popd; \
                 tar -czf $(tmp_src)/$$i.tar.gz $$i; \
-        done;
+        done
 
 #setup: install-srpms copy-patches copy-specs patch-specs tarballs
@@ -181 +182 @@
 
 frob-openafs:
-        @if [ ! -d "/etc/openafs/" ]; then \
+        @set -ex; \
+        if [ ! -d "/etc/openafs/" ]; then \
         echo "/etc/openafs does not exist"; \
         exit 1; \