Skip to content

Commit a74e8fa

Browse files
author
bartus
committed
Fix man page generator (DISTDIR/prefix not issue)
blender.1.py doesn't account for `DISDIR/prefix` when setting BLENDER_BIN path.
1 parent 0c9b58a commit a74e8fa

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.SRCINFO

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pkgbase = blender-develop-git
22
pkgdesc = Development version of Blender (non-conflicting version)
3-
pkgver = 4.2.r133577.g56f8c1c0f6e
3+
pkgver = 4.2.r133688.g015ae2b3a60
44
pkgrel = 1
55
url = https://blender.org/
66
changelog = blender.changelog

PKGBUILD

+3-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _fragment=${FRAGMENT:-#branch=main}
3636
_CMAKE_FLAGS+=( -DWITH_PYTHON_INSTALL=OFF )
3737

3838
pkgname=blender-develop-git
39-
pkgver=4.2.r133577.g56f8c1c0f6e
39+
pkgver=4.2.r133688.g015ae2b3a60
4040
pkgrel=1
4141
pkgdesc="Development version of Blender (non-conflicting version)"
4242
changelog=blender.changelog
@@ -135,7 +135,8 @@ build() {
135135
package() {
136136
_suffix=${pkgver%%.r*}
137137
_pyver=$(python -c 'import sys; print(str(sys.version_info[0]) + "." + str(sys.version_info[1]))')
138-
BLENDER_SYSTEM_PYTHON=/usr/lib/python${_pyver} BLENDER_SYSTEM_RESOURCES="${pkgdir}/usr/share/blender/${_suffix}" DESTDIR="${pkgdir}" cmake --install build || ((DISABLE_DRACO)) && true
138+
sed -i "/BLENDER_BIN/s|\(/usr/bin/blender\)|${pkgdir}\1|" "${srcdir}"/build/source/creator/cmake_install.cmake
139+
cmake --install build --prefix "${pkgdir}/usr" -v
139140
python -m compileall "${pkgdir}/usr/share/blender"
140141
python -O -m compileall "${pkgdir}/usr/share/blender"
141142

0 commit comments

Comments
 (0)