diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2006-09-14 05:17:12 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2006-09-14 05:17:12 +0000 |
| commit | cef3a38ffbacc0128fe0b7c5cd31ef5fbfb007b7 (patch) | |
| tree | b1cd898349b9d218c336b47dd458c708ab2ef22a /Tools | |
| parent | 72ac1bdadba336d9465b22e765111b11295909ac (diff) | |
Notes
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/portbuild/scripts/makeworld | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Tools/portbuild/scripts/makeworld b/Tools/portbuild/scripts/makeworld index 7ed0ee0052c8..2e4bc2e3e9c3 100755 --- a/Tools/portbuild/scripts/makeworld +++ b/Tools/portbuild/scripts/makeworld @@ -35,12 +35,13 @@ while [ $# -gt 0 ]; do done if [ "$client" = "1" ]; then - cd ${pb}/${arch}/src-client + SRCBASE=${pb}/${arch}/src-client shift 1 else - cd ${pb}/${arch}/${branch}/src + SRCBASE=${pb}/${arch}/${branch}/src export __MAKE_CONF=/dev/null fi +cd ${SRCBASE} if [ "$nocvs" = "0" ]; then echo "==> Updating source tree" @@ -76,10 +77,15 @@ if [ "$client" = "0" ]; then fi echo "==> Starting make distribute" - cd etc - make obj - make all - make distribute DISTRIBUTION=/var/chroot/ + if [ "$branch" = "5" ]; then + cd etc + make obj + make all + make distribute DISTRIBUTION=/var/chroot/ + else + make DESTDIR=/var/chroot distrib-dirs && + make DESTDIR=/var/chroot distribution + fi error=$? if [ "$error" != "0" ]; then exit $error |