mrrl

commit f8de25aa4040172875f578a66476ad6871606fca
parent 4fdd2ac26ba978c032067ea4ee0464b517bce385
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Wed, 10 Dec 2025 19:08:22 +0000

vis

Diffstat:
M
templates/pkg/vis
 | 
3
++-
M
variants/ccx-x86_64/default.environment
 | 
2
+-
M
variants/ccx-x86_64/userspace.environment
 | 
2
+-
M
variants/ccx-x86_64/vis
 | 
3
++-
M
variants/root-x86_64/default.environment
 | 
2
+-
M
variants/root-x86_64/userspace.environment
 | 
2
+-
M
variants/root-x86_64/vis
 | 
3
++-

7 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/templates/pkg/vis b/templates/pkg/vis
@@ -15,7 +15,7 @@ build_env_static
 	--prefix="$prefix" \
 	--bindir="$prefix/{{bindir}}" \
 	--mandir="$prefix/{{mandir}}" \
-	--docdir="$prefix/{{docdir}}/{{shortname}}" \
+	--docdir="$prefix/{{docdir}}" \
 	--sharedir="$prefix/{{datadir}}" \
 	--enable-curses \
 	--disable-lua \
@@ -25,6 +25,7 @@ build_env_static
 	--enable-acl \
 	--enable-help
 sed -i 's/ -fPIE//; s/ -pie//' config.mk
+sed -i 's!PREFIX}/bin!PREFIX}/$(BINDIR)!g' config.mk
  
 {% endblock configure %}
 {% block check -%}
diff --git a/variants/ccx-x86_64/default.environment b/variants/ccx-x86_64/default.environment
@@ -83,7 +83,7 @@
 #+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
 #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+vis.d393efe1a84f7fc7bfea9201d04781f04decddb42d2d9eae5ccf6e4cdd38a9ac
+#+vis.dcb937e9756e04c70f92b52de3888025c21ee3335e840040eb4a7ffd1213e852
 #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
 #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af
diff --git a/variants/ccx-x86_64/userspace.environment b/variants/ccx-x86_64/userspace.environment
@@ -83,7 +83,7 @@
 #+mlog.13adb42c1c505e3026114651c2f36d0a8c0723cc44e5c60f023d36db089806c5
 #+findutils.89e63f707a8d7be6a083e58b937c21752b28c1a5d7760dd85dd985fa85366e3b
 #+nawk.4028835d6434ac7d8655c7f9e74ff307e2db89bf2c94002a309babd8a6780007
-#+vis.d393efe1a84f7fc7bfea9201d04781f04decddb42d2d9eae5ccf6e4cdd38a9ac
+#+vis.dcb937e9756e04c70f92b52de3888025c21ee3335e840040eb4a7ffd1213e852
 #+squashfs-tools.d674abf818e01e9a46d0a6e995c2fa8f4e6086671e2b4d8345e8f592e0558128
 #+mandoc.e037587ebdf49fabbb28d83caa5b22be308fa7406c22f4f7545106426c458bdc
 #+tinyssh.0ac46feb5c124a8975937476f186cccae55fefec0cb8865ff2bac544a2af31af 
\ No newline at end of file
diff --git a/variants/ccx-x86_64/vis b/variants/ccx-x86_64/vis
@@ -69,7 +69,7 @@ build_env_static
 	--prefix="$prefix" \
 	--bindir="$prefix/command" \
 	--mandir="$prefix/man" \
-	--docdir="$prefix/doc/vis" \
+	--docdir="$prefix/doc" \
 	--sharedir="$prefix/data" \
 	--enable-curses \
 	--disable-lua \
@@ -79,6 +79,7 @@ build_env_static
 	--enable-acl \
 	--enable-help
 sed -i 's/ -fPIE//; s/ -pie//' config.mk
+sed -i 's!PREFIX}/bin!PREFIX}/$(BINDIR)!g' config.mk
  
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))
diff --git a/variants/root-x86_64/default.environment b/variants/root-x86_64/default.environment
@@ -83,7 +83,7 @@
 #+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
 #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+vis.6fa7d89a811f5a69fd5901d0b1f9cd16bf096eb3978d98cacc15d18a960a5926
+#+vis.47c02ae716c717d0613c430e5d2ffd1d292dc50056eef2302968fad7fa2caa8e
 #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
 #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8
diff --git a/variants/root-x86_64/userspace.environment b/variants/root-x86_64/userspace.environment
@@ -83,7 +83,7 @@
 #+mlog.4b3d68ba77440437786ec8ab629cd919074551e60c520d8ae8eb4b67a02223c2
 #+findutils.519e93628e65c4e5ef4d7ac1cf4396e1689e3c8e192bd8678571d90fb9d1152b
 #+nawk.48e7e5c0112e297121356bf98ff987d3d85d92b2696452ecea8ae4cffc57c10d
-#+vis.6fa7d89a811f5a69fd5901d0b1f9cd16bf096eb3978d98cacc15d18a960a5926
+#+vis.47c02ae716c717d0613c430e5d2ffd1d292dc50056eef2302968fad7fa2caa8e
 #+squashfs-tools.d17a5fe5700099cda5f27c79c24f4a75314d9c2160d9e5a31b1b4baf5b6c3365
 #+mandoc.6f6a20cc42e1e71817249856c921d8e3686a869c979a34fcbd19de2ab00130ac
 #+tinyssh.7b2b9a4c3ff2d42a7b138c3830eb3c0a275aa391fb0812ccaecca383d2e6caa8 
\ No newline at end of file
diff --git a/variants/root-x86_64/vis b/variants/root-x86_64/vis
@@ -69,7 +69,7 @@ build_env_static
 	--prefix="$prefix" \
 	--bindir="$prefix/command" \
 	--mandir="$prefix/man" \
-	--docdir="$prefix/doc/vis" \
+	--docdir="$prefix/doc" \
 	--sharedir="$prefix/data" \
 	--enable-curses \
 	--disable-lua \
@@ -79,6 +79,7 @@ build_env_static
 	--enable-acl \
 	--enable-help
 sed -i 's/ -fPIE//; s/ -pie//' config.mk
+sed -i 's!PREFIX}/bin!PREFIX}/$(BINDIR)!g' config.mk
  
 
 make -j${JOBS:-1} -l$((1+${JOBS:-1}))