Changeset 916


Ignore:
Timestamp:
05/22/13 19:57:21 (8 years ago)
Author:
olahaye
Message:

[Makefile] Fixed cleanup in tarball.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1.0/Makefile

    r915 r916  
    5252
    5353tarball-gzip:   $(TMPDIR)/.monarch_buildroot ${REQUIRED}
    54         @( cd ${TMPDIR}/.monarch_buildroot; tar zcf ${TMPDIR}/ganglia_jobmonarch-${VERSION}.tar.gz ./ganglia_jobmonarch-${VERSION} )
    55         @rm -rf ${TMPDIR}/.monarch_buildroot
     54        @( cd ${TMPDIR}/.monarch_buildroot; tar zcf $(TMPDIR)/ganglia_jobmonarch-${VERSION}.tar.gz ./ganglia_jobmonarch-${VERSION} )
     55        @mv -f ${TMPDIR}/ganglia_jobmonarch-${VERSION}.tar.gz ..
    5656        @echo "Wrote: ../ganglia_jobmonarch-${VERSION}.tar.gz"
    5757
    5858tarball-bzip:   $(TMPDIR)/.monarch_buildroot ${REQUIRED}
    59         @( cd ${TMPDIR}/.monarch_buildroot; tar jcf ganglia_jobmonarch-${VERSION}.tar.bz2 ./ganglia_jobmonarch-${VERSION} )
    60         @mv -f ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}.tar.bz2 ..
    61         @rm -rf ${TMPDIR}/.monarch_buildroot
     59        @( cd ${TMPDIR}/.monarch_buildroot; tar jcf ${TMPDIR}/ganglia_jobmonarch-${VERSION}.tar.bz2 ./ganglia_jobmonarch-${VERSION} )
     60        @mv -f ${TMPDIR}/ganglia_jobmonarch-${VERSION}.tar.bz2 ..
    6261        @echo "Wrote: ../ganglia_jobmonarch-${VERSION}.tar.bz2"
    6362
    6463rpm: tarball-bzip
    6564        # Binary package will reflect most distro where ganglia default location is /usr/share/ganglia
    66         rpmbuild -tb --define '%custom_web_prefixdir /usr/share/ganglia' ../ganglia_jobmonarch-${VERSION}.tar.bz2
     65        @LC_ALL=C rpmbuild -tb --define '%custom_web_prefixdir /usr/share/ganglia' ../ganglia_jobmonarch-${VERSION}.tar.bz2|grep "Wrote: "
    6766
    6867srpm: tarball-bzip
    69         rpmbuild -ts --define '%dist %{nil}' ../ganglia_jobmonarch-${VERSION}.tar.bz2
     68        @LC_ALL=C rpmbuild -ts --define '%dist %{nil}' ../ganglia_jobmonarch-${VERSION}.tar.bz2|grep "Wrote: "
    7069
    7170deb: ${REQUIRED} $(TMPDIR)/.monarch_buildroot ./debian
    7271        @( cd ${TMPDIR}/.monarch_buildroot/ganglia_jobmonarch-${VERSION}; dpkg-buildpackage -b -uc -us )
    73         @mv ${TMPDIR}/.monarch_buildroot/jobmonarch*$(VERSION)*.deb ..
     72        @mv ${TMPDIR}/.monarch_buildroot/jobmonarch-*_$(VERSION)-$(RELEASE)_all.deb ..
    7473        @rm -rf ${TMPDIR}/.monarch_buildroot
    7574        @echo "Wrote:"
     
    163162        @(cd ./debian; rm -rf files *.log *.substvars jobmonarch/ jobmonarch-jobmond/ jobmonarch-jobarchived/ jobmonarch-webfrontend/ tmp/)
    164163        @rm -f web/addons/job_monarch/conf.php
     164
     165clean_all:      clean
     166        @# Cannot include this in clean otherwise, dpkg-buildpackage will commit scuicide.
     167        @rm -rf ${TMPDIR}/.monarch_buildroot
     168
Note: See TracChangeset for help on using the changeset viewer.