diff --git a/compile/src/tigervnc/build.sh b/compile/src/tigervnc/build.sh index 69850bd1..792af573 100644 --- a/compile/src/tigervnc/build.sh +++ b/compile/src/tigervnc/build.sh @@ -74,8 +74,9 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" # set -u; err if not exist -DEST_DIR="/" #/tmp/xx-install> / test -z "$TARGETPATH" && export TARGETPATH=/opt/base +DEST_DIR="/" #/tmp/xx-install> / +INS_PREFIX=$TARGETPATH # rm -rf $LOGS; #avoid deleted @batch-mode CACHE=$TARGETPATH/../.cache; LOGS=$TARGETPATH/../.logs; mkdir -p $CACHE $LOGS function down_catfile(){ @@ -317,7 +318,7 @@ log "Configuring TigerVNC..." -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ - -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_PREFIX=$INS_PREFIX \ -DCMAKE_BUILD_TYPE=Release \ -DINSTALL_SYSTEMD_UNITS=OFF \ -DENABLE_NLS=OFF \ @@ -337,7 +338,7 @@ autoreconf -fiv /tmp/tigervnc/unix/xserver cd /tmp/tigervnc/unix/xserver && CFLAGS="$CFLAGS -Wno-implicit-function-declaration" ./configure \ --build=$(TARGETPLATFORM= xx-clang --print-target-triple) \ --host=$(xx-clang --print-target-triple) \ - --prefix=/usr \ + --prefix=$INS_PREFIX \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ --with-xkb-path=${TARGETPATH}/usr/share/X11/xkb \ @@ -471,7 +472,7 @@ log "Configuring xkbcomp..." LDFLAGS="-Wl,--as-needed --static -static -Wl,--strip-all -Wl,--start-group -lX11 -lxcb -lXdmcp -lXau -Wl,--end-group" LIBS="$LDFLAGS" ./configure \ --build=$(TARGETPLATFORM= xx-clang --print-target-triple) \ --host=$(xx-clang --print-target-triple) \ - --prefix=/usr \ + --prefix=$INS_PREFIX \ ) log "Compiling xkbcomp..."