From ea6ae0cb156b9e3fb17df1ad1fa5765c9c59a5d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 8 May 2016 01:10:35 +0200 Subject: [PATCH] firebird: move to /usr/share/firebird --- srcpkgs/firebird/template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/srcpkgs/firebird/template b/srcpkgs/firebird/template index 144f96d2628..c87ede20163 100644 --- a/srcpkgs/firebird/template +++ b/srcpkgs/firebird/template @@ -1,11 +1,11 @@ # Template file for 'firebird' pkgname=firebird version=2.5.5.26952 -revision=3 +revision=4 _build=0 wrksrc="${pkgname^}-${version}-${_build}" build_style=gnu-configure -configure_args="--prefix=/opt/firebird --with-system-icu --with-system-editline" +configure_args="--prefix=/usr/share/firebird --with-system-icu --with-system-editline" nocross=yes hostmakedepends="automake libtool pkg-config icu" makedepends="boost-devel libedit-devel icu-devel ncurses-devel libatomic_ops-devel" @@ -48,13 +48,13 @@ do_install() { find gen/buildroot -type f -perm 0444 -exec chmod 0644 "{}" \; find gen/buildroot -type f -perm 0555 -exec chmod 0755 "{}" \; - # Move some directories and files from /opt/firebird to /usr + # Move some directories and files from /usr/share/firebird to /usr mkdir -p gen/buildroot/usr/bin mkdir -p gen/buildroot/usr/include mkdir -p gen/buildroot/usr/lib - mv gen/buildroot/opt/firebird/bin/fb_config gen/buildroot/usr/bin/ - mv gen/buildroot/opt/firebird/include/* gen/buildroot/usr/include/ - mv gen/buildroot/opt/firebird/lib/* gen/buildroot/usr/lib/ + mv gen/buildroot/usr/share/firebird/bin/fb_config gen/buildroot/usr/bin/ + mv gen/buildroot/usr/share/firebird/include/* gen/buildroot/usr/include/ + mv gen/buildroot/usr/share/firebird/lib/* gen/buildroot/usr/lib/ # Re-create shared library symlinks in /usr/lib for _lib in libfbclient libfbembed; do @@ -72,8 +72,8 @@ do_install() { # Modify fb_config for the /usr/include and /usr/lib paths sed -i gen/buildroot/usr/bin/fb_config \ - -e "s;/opt/firebird/include;/usr/include;g" \ - -e "s;/opt/firebird/lib;/usr/lib;g" + -e "s;/usr/share/firebird/include;/usr/include;g" \ + -e "s;/usr/share/firebird/lib;/usr/lib;g" cp -pR gen/buildroot/* ${DESTDIR}/ @@ -94,7 +94,7 @@ libfbclient_package() { done vmove usr/lib/libgds.so.0 vmove usr/lib/libib_util.so - vmove opt/firebird/*.msg + vmove usr/share/firebird/*.msg vlicense doc/license/IDPL.txt IDPL vlicense doc/license/README.license.usage.txt LICENSE }