use cmake / shell syntax instead of autotools..

Xpra-org · Feb 20, 2023 · 321c427 · 321c427
1 parent e0ce1f5
commit 321c427
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -47,7 +47,7 @@
     </dependencies>
   </autotools>
   <!---->
-  <cmake id="libjpeg" cmakeargs="-DCMAKE_INSTALL_PREFIX:PATH=%(prefix) -DCMAKE_INSTALL_LIBDIR:PATH=lib">
+  <cmake id="libjpeg" cmakeargs="-DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_LIBDIR:PATH=lib">
     <branch module="/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.1.5.1.tar.gz" version="2.1.5.1"
             hash="sha256:61846251941e5791005fb7face196eec24541fce04f12570c308557529e92c75"
             repo="github-tarball" checkoutdir="libjpeg-turbo-2.1.5.1" />

diff --git a/modulesets-unstable/gtk-osx-bootstrap.modules b/modulesets-unstable/gtk-osx-bootstrap.modules
@@ -26,7 +26,7 @@
     </dependencies>
   </autotools>
 
-  <cmake id="libjpeg" cmakeargs="-DCMAKE_INSTALL_PREFIX:PATH=%(prefix) -DCMAKE_INSTALL_LIBDIR:PATH=lib">
+  <cmake id="libjpeg" cmakeargs="-DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_LIBDIR:PATH=lib">
     <branch module="/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.1.5.1.tar.gz" version="2.1.5.1"
             hash="sha256:61846251941e5791005fb7face196eec24541fce04f12570c308557529e92c75"
             repo="github-tarball" checkoutdir="libjpeg-turbo-2.1.5.1" />

diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
@@ -26,7 +26,7 @@
     </dependencies>
   </autotools>
 
-  <cmake id="libjpeg" cmakeargs="-DCMAKE_INSTALL_PREFIX:PATH=%(prefix) -DCMAKE_INSTALL_LIBDIR:PATH=lib">
+  <cmake id="libjpeg" cmakeargs="-DCMAKE_INSTALL_PREFIX:PATH=${JHBUILD_PREFIX} -DCMAKE_INSTALL_LIBDIR:PATH=lib">
     <branch module="/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.1.5.1.tar.gz" version="2.1.5.1"
             hash="sha256:61846251941e5791005fb7face196eec24541fce04f12570c308557529e92c75"
             repo="github-tarball" checkoutdir="libjpeg-turbo-2.1.5.1" />