diff options
| author | Continuous Integration <ci@tangent.org> | 2014-02-09 02:52:05 -0800 |
|---|---|---|
| committer | Continuous Integration <ci@tangent.org> | 2014-02-09 02:52:05 -0800 |
| commit | 9b82636d0efe1ea990cd20eacd17c8b13a5b7743 (patch) | |
| tree | 99986484a6d87d836d9d3115914bfb0754645748 | |
| parent | f5cfb1e5d6306b713403b8efdbd5b015e7a6cf94 (diff) | |
| parent | 8c406df883b9d49abe134b4bd74afc102019df8e (diff) | |
| download | libmemcached-9b82636d0efe1ea990cd20eacd17c8b13a5b7743.tar.gz | |
Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-465
| -rwxr-xr-x | bootstrap.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 6f6821b7..c4418fdc 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1010,17 +1010,16 @@ make_rpm () { if command_exists 'rpmbuild'; then if [ -f 'rpm.am' -o -d 'rpm' ]; then - mkdir -p ~/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} - mkdir -p ~/rpmbuild/RPMS/{i386,i486,i586,i686,noarch,athlon} - run_configure_if_required make_target 'dist-rpm' - mkdir artifacts - cp *gz *rpm artifacts - if $jenkins_build_environment; then - make_target 'clean' + mkdir artifacts + mv *gz *rpm artifacts + + make_target 'maintainer-clean' + mv artifacts/* . + rmdir artifacts fi fi |