diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | build | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -1,7 +1,7 @@ VERSION=0.1 SCM=$(shell if test -d .svn; then echo svn; elif test -d .git; then echo git; fi) DATE=$(shell date +%Y%m%d%H%M) -BUILD=build +BUILD=obs-build INITVM_ARCH=$(shell bash -c '. common_functions ; build_host_arch; echo $$BUILD_INITVM_ARCH') @@ -68,8 +68,8 @@ install: install -m644 *.pm baselibs_global*.conf lxc.conf $(DESTDIR)$(pkglibdir) install -m644 configs/* $(DESTDIR)$(pkglibdir)/configs install -m644 build.1 $(DESTDIR)$(man1dir) - ln -sf $(pkglibdir)/build $(DESTDIR)$(bindir)/build - ln -sf $(pkglibdir)/vc $(DESTDIR)$(bindir)/buildvc + ln -sf $(pkglibdir)/build $(DESTDIR)$(bindir)/obs-build + ln -sf $(pkglibdir)/vc $(DESTDIR)$(bindir)/obs-buildvc ln -sf $(pkglibdir)/unrpm $(DESTDIR)$(bindir)/unrpm # Allow initvm to be packaged seperately from the rest of build. This @@ -13,8 +13,8 @@ if test "$0" = /sbin/init ; then fi test -z "$BUILD_DIR" -a -e /.build/build.data -a -z "$BUILD_IGNORE_2ND_STAGE" && BUILD_DIR=/.build -test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/build -test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/build-root +test -z "$BUILD_DIR" && BUILD_DIR=/usr/lib/obs-build +test -z "$BUILD_ROOT" && BUILD_ROOT=/var/tmp/obs-build-root test -z "$CONFIG_DIR" && CONFIG_DIR="$BUILD_DIR/configs" export BUILD_ARCH BUILD_HOST_ARCH BUILD_ROOT BUILD_RPMS BUILD_DIR BUILD_DEBUG @@ -73,7 +73,7 @@ SIGNDUMMY= DO_STATISTICS= RUN_SHELL= CCACHE= -CACHE_DIR=/var/cache/build +CACHE_DIR=/var/cache/obs-build # This is for insserv |