projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
(from parent 1:
f5cfb1e
)
Merge bzr://10.0.3.21/ Build: jenkins-Libmemcached-465
author
Continuous Integration
<ci@tangent.org>
Sun, 9 Feb 2014 10:52:05 +0000
(
02:52
-0800)
committer
Continuous Integration
<ci@tangent.org>
Sun, 9 Feb 2014 10:52:05 +0000
(
02:52
-0800)
bootstrap.sh
patch
|
blob
|
history
diff --git
a/bootstrap.sh
b/bootstrap.sh
index 6f6821b765ff3fe10ab1650f868c6fb413e1f232..c4418fdcc7c6c62025e1938d718812059ce2d0ec 100755
(executable)
--- 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