diff --git a/srcpkgs/firebird/template b/srcpkgs/firebird/template index a6041395f6c..3ff92fa51f0 100644 --- a/srcpkgs/firebird/template +++ b/srcpkgs/firebird/template @@ -6,7 +6,7 @@ _build=0 _uver=${version//./_} wrksrc="${pkgname^}-${version}-${_build}" build_style=gnu-configure -configure_args="--prefix=/usr/share/firebird --with-system-icu --with-system-editline" +configure_args="--prefix=/usr/libexec/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" @@ -54,13 +54,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 /usr/share/firebird to /usr + # Move some directories and files from /usr/libexec/firebird to /usr mkdir -p gen/buildroot/usr/bin mkdir -p gen/buildroot/usr/include mkdir -p 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/ + mv gen/buildroot/usr/libexec/firebird/bin/fb_config gen/buildroot/usr/bin/ + mv gen/buildroot/usr/libexec/firebird/include/* gen/buildroot/usr/include/ + mv gen/buildroot/usr/libexec/firebird/lib/* gen/buildroot/usr/lib/ # Re-create shared library symlinks in /usr/lib for _lib in libfbclient libfbembed; do @@ -78,8 +78,8 @@ do_install() { # Modify fb_config for the /usr/include and /usr/lib paths sed -i gen/buildroot/usr/bin/fb_config \ - -e "s;/usr/share/firebird/include;/usr/include;g" \ - -e "s;/usr/share/firebird/lib;/usr/lib;g" + -e "s;/usr/libexec/firebird/include;/usr/include;g" \ + -e "s;/usr/libexec/firebird/lib;/usr/lib;g" cp -pR gen/buildroot/* ${DESTDIR}/ @@ -100,7 +100,7 @@ libfbclient_package() { done vmove usr/lib/libgds.so.0 vmove usr/lib/libib_util.so - vmove usr/share/firebird/*.msg + vmove usr/libexec/firebird/*.msg vlicense doc/license/IDPL.txt IDPL vlicense doc/license/README.license.usage.txt LICENSE }