Ignore:
Timestamp:
Dec 31, 2011, 9:46:10 PM (11 years ago)
Author:
andersk
Message:
Makefile: Make multiline statements fail on error

Also stop pointlessly hiding the commands being executed.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/Makefile

    r2103 r2104  
    4848
    4949info:
    50         @echo "The following packages are available:"; \
    51         echo "$(allsrc)"; \
    52         echo "Run 'make all' to build all packages."
     50        @echo "The following packages are available:"
     51        @echo "$(allsrc)"
     52        @echo "Run 'make all' to build all packages."
    5353
    5454minimal-clean:
     
    6060
    6161mkdir-tree:
    62         @rpmdev-setuptree
     62        rpmdev-setuptree
    6363        mkdir -p $(out_sbin)
    6464        ln -sTf $(topdir) rpmbuild
     
    6666download: download_stamp
    6767download_stamp:
    68         @mkdir -p $(dload); \
     68        mkdir -p $(dload)
    6969        #wget -qO- -nv $(server_url)/$(server_arch) | xargs make
    7070        cd $(dload) && yumdownloader --disablerepo=scripts --source $(upstream_yum)
     
    8686
    8787copy-patches: mkdir-tree
    88         @cp $(patches)/*.patch $(tmp_src); \
    89         cd $(tmp_src);
     88        cp $(patches)/*.patch $(tmp_src)
    9089
    9190install-srpms: mkdir-tree download
    92         rpm $(rpm_args) -i $(dload)/*.src.rpm 2>/dev/null;
     91        rpm $(rpm_args) -i $(dload)/*.src.rpm 2>/dev/null
    9392
    9493copy-specs: mkdir-tree
     
    9796# Remove old .orig files so we're not mislead
    9897patch-specs: install-srpms
    99         @cd ${tmp_specs}; \
     98        @set -ex; \
     99        cd ${tmp_specs}; \
    100100        list=`ls ${specs}/*.spec.patch`; \
    101101        rm -f *.orig; \
     
    114114                        -e "s/SVNVERSION_TO_UPDATE/$${version}/" \
    115115                ${tmp_specs}/$$base.spec; \
    116         done;
     116        done
    117117
    118118# 1. use the package's Makefile to delete leftover files and run autoconf
    119119# 2. create a tarball (we want it to contain the autoconf output)
    120120tarballs: mkdir-tree
    121         @cd ${oursrcdir}; \
     121        @set -ex; \
     122        cd ${oursrcdir}; \
    122123        list=`find -mindepth 1 -maxdepth 1 -type d | grep -v ".svn"`; \
    123124        for i in $$list; do \
     
    131132                popd; \
    132133                tar -czf $(tmp_src)/$$i.tar.gz $$i; \
    133         done;
     134        done
    134135
    135136#setup: install-srpms copy-patches copy-specs patch-specs tarballs
     
    181182
    182183frob-openafs:
    183         @if [ ! -d "/etc/openafs/" ]; then \
     184        @set -ex; \
     185        if [ ! -d "/etc/openafs/" ]; then \
    184186        echo "/etc/openafs does not exist"; \
    185187        exit 1; \
Note: See TracChangeset for help on using the changeset viewer.