diff options
| author | kris <kris@FreeBSD.org> | 2006-09-14 13:17:12 +0800 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2006-09-14 13:17:12 +0800 |
| commit | 10cd7a9a2ff3c7e0a0177638dcba803361d2446b (patch) | |
| tree | 8ce960aa420d35997f421c0aaedb6814a682acd0 /Tools/portbuild | |
| parent | 4b750e08a1ae17ae12ca9f65939d6e9a98359e8b (diff) | |
| download | freebsd-ports-gnome-10cd7a9a2ff3c7e0a0177638dcba803361d2446b.tar.gz freebsd-ports-gnome-10cd7a9a2ff3c7e0a0177638dcba803361d2446b.tar.zst freebsd-ports-gnome-10cd7a9a2ff3c7e0a0177638dcba803361d2446b.zip | |
* Use SRCBASE for source location
* The 5.x variant for populating /etc does not work on 6.x and above, and
vice versa. Conditionalize old and new methods.
Diffstat (limited to 'Tools/portbuild')
| -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 |