wok-current rev 19230
dia, remmina: fix build
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Jun 24 19:30:02 2016 +0300 (2016-06-24) |
parents | fe2894291cf6 |
children | 140b8603135c |
files | dia/receipt remmina/receipt |
line diff
1.1 --- a/dia/receipt Fri Jun 24 16:28:42 2016 +0200 1.2 +++ b/dia/receipt Fri Jun 24 19:30:02 2016 +0300 1.3 @@ -36,15 +36,6 @@ 1.4 # Rules to gen a SliTaz package suitable for Tazpkg. 1.5 genpkg_rules() 1.6 { 1.7 - mkdir -p $fs/usr/lib/dia $fs/usr/share 1.8 - 1.9 - cp -a $install/usr/bin $fs/usr 1.10 - cp -a $install/usr/lib/dia/*.so $fs/usr/lib/dia 1.11 - cp -a $install/usr/share/applications $fs/usr/share 1.12 - cp -a $install/usr/share/dia $fs/usr/share 1.13 - cp -a $install/usr/share/icons $fs/usr/share 1.14 - rm -r $fs/usr/share/icons/hicolor/scalable 1.15 -# cp -a $install/usr/share/locale $fs/usr/share 1.16 - cp -a $install/usr/share/mime-info $fs/usr/share 1.17 - cp -a $install/usr/share/oaf $fs/usr/share 1.18 + cp -a $install/* $fs 1.19 + rm -r $fs/usr/lib/dia/*.la $fs/usr/share/locale 1.20 }
2.1 --- a/remmina/receipt Fri Jun 24 16:28:42 2016 +0200 2.2 +++ b/remmina/receipt Fri Jun 24 19:30:02 2016 +0300 2.3 @@ -21,11 +21,15 @@ 2.4 # Rules to configure and make the package. 2.5 compile_rules() 2.6 { 2.7 + # Here `sed -i '/external_tools/d' ...` because cmake (make install) 2.8 + # produce error trying to install "external tools" to 2.9 + # "$install/root/.remmina/external_tools/" 2.10 export LDFLAGS="$LDFLAGS -Wl,--copy-dt-needed-entries -lX11" 2.11 mkdir build 2.12 cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_TELEPATHY=OFF \ 2.13 -DWITH_AVAHI=OFF && 2.14 make && 2.15 + sed -i '/external_tools/d' $src/remmina/cmake_install.cmake && 2.16 make DESTDIR=$DESTDIR install 2.17 cp -a remmina/include $DESTDIR/usr 2.18 }