diff --git a/shutils/configure_funcs.sh b/shutils/configure_funcs.sh index 334580a07c..8c37b442a2 100644 --- a/shutils/configure_funcs.sh +++ b/shutils/configure_funcs.sh @@ -84,10 +84,16 @@ configure_src_phase() # Packages using GNU autoconf # if [ "$build_style" = "gnu_configure" ]; then + if [ -z "$in_chroot" ]; then + infodir=${DESTDIR}/usr/share/info + mandir=${DESTDIR}/usr/share/man + else + infodir=/usr/share/info + mandir=/usr/share/man + fi ${configure_script} \ --prefix=${_prefix} --sysconfdir=/etc \ - --infodir=${DESTDIR}/usr/share/info \ - --mandir=${DESTDIR}/usr/share/man \ + --infodir=${infodir} --mandir=${mandir} \ ${configure_args} # # Packages using propietary configure scripts. diff --git a/templates/eject/template b/templates/eject/template index eabde1ff36..976da6e337 100644 --- a/templates/eject/template +++ b/templates/eject/template @@ -4,7 +4,6 @@ version=2.1.5 wrksrc=eject distfiles="http://ca.geocities.com/jefftranter@rogers.com/$pkgname-$version.tar.gz" build_style=gnu_configure -configure_args="--mandir=/usr/share/man" make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install" short_desc="Ejects CDs and operates CD-Changers under Linux" maintainer="Juan RP " diff --git a/templates/kbd/template b/templates/kbd/template index 8d39385b1b..be2c47c4bc 100644 --- a/templates/kbd/template +++ b/templates/kbd/template @@ -3,8 +3,7 @@ pkgname=kbd version=1.15 distfiles="http://www.kernel.org/pub/linux/utils/kbd/kbd-$version.tar.bz2" build_style=configure -configure_args="--datadir=/lib/kbd --mandir=/usr/share/man --bindir=/sbin - --localedir=/usr/share/locale" +configure_args="--datadir=/lib/kbd --bindir=/sbin --localedir=/usr/share/locale" make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version" short_desc="Linux keyboard utilities" maintainer="Juan RP " diff --git a/templates/ntp/template b/templates/ntp/template index ace47d474d..144384b3ee 100644 --- a/templates/ntp/template +++ b/templates/ntp/template @@ -6,8 +6,7 @@ distfiles="http://archive.ntp.org/ntp4/$pkgname-$version.tar.gz" build_style=gnu_configure configure_args="--enable-linuxcaps --enable-getifaddrs=glibc --enable-all-clocks --enable-parse-clocks --with-crypto=openssl - --enable-accurate-adjtime --without-rpath --mandir=/usr/share/man - --enable-ipv6" + --enable-accurate-adjtime --without-rpath --enable-ipv6" make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install" short_desc="The Network Time Protocol" maintainer="Juan RP " diff --git a/templates/openssh/template b/templates/openssh/template index 9b7a295a1a..a857431318 100644 --- a/templates/openssh/template +++ b/templates/openssh/template @@ -8,8 +8,8 @@ build_style=gnu_configure configure_args="--libexecdir=/usr/libexec/openssh --with-tcp-wrappers --datadir=/usr/share/openssh --sysconfdir=/etc/ssh --with-privsep-user=nobody --with-md5-passwords - --with-pam --with-mantype=man --mandir=/usr/share/man - --with-xauth=/usr/bin/xauth --without-rpath --with-ssl-engine + --with-pam --with-mantype=man --with-xauth=/usr/bin/xauth + --without-rpath --with-ssl-engine --without-selinux --with-privsep-path=/var/chroot/ssh" make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install" short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2" diff --git a/templates/pam/template b/templates/pam/template index 097d3aa9d0..f87b5aad9e 100644 --- a/templates/pam/template +++ b/templates/pam/template @@ -8,8 +8,7 @@ http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$version.tar.bz2" build_style=gnu_configure configure_args="--disable-selinux --libdir=/lib --docdir=/usr/share/doc/pam --enable-securedir=/lib/security - --enable-sconfigdir=/etc/security --mandir=/usr/share/man - --infodir=/usr/share/info --localedir=/usr/share/locale + --enable-sconfigdir=/etc/security --localedir=/usr/share/locale --datadir=/usr/share --disable-rpath --enable-read-both-confs" make_install_args="DESTDIR=$XBPS_DESTDIR/$pkgname-$version sysconfdir=/etc/security" diff --git a/templates/shadow/template b/templates/shadow/template index bd369a86b5..cc4107de80 100644 --- a/templates/shadow/template +++ b/templates/shadow/template @@ -4,8 +4,8 @@ version=4.1.2.2 patch_files="$pkgname-enable-pam.diff" distfiles="ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--libdir=/lib --mandir=/usr/share/man --enable-shared - --disable-static --with-libpam --without-selinux" +configure_args="--libdir=/lib --enable-shared --disable-static + --with-libpam --without-selinux" make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install" short_desc="Shadow password file utilities" maintainer="Juan RP " diff --git a/templates/udev/template b/templates/udev/template index a902746d0a..2419b7edd4 100644 --- a/templates/udev/template +++ b/templates/udev/template @@ -4,7 +4,7 @@ version=139 distfiles=" http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-${version}.tar.bz2" build_style=gnu_configure -configure_args="--exec-prefix= --without-selinux --mandir=/usr/share/man" +configure_args="--exec-prefix= --without-selinux" make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install" short_desc="A userspace implementation of devfs" maintainer="Juan RP " diff --git a/templates/util-linux-ng/template b/templates/util-linux-ng/template index 479f3b2c0d..d0d01c2a19 100644 --- a/templates/util-linux-ng/template +++ b/templates/util-linux-ng/template @@ -3,8 +3,7 @@ pkgname=util-linux-ng version=2.14.2 distfiles="http://www.kernel.org/pub/linux/utils/$pkgname/v2.14/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--enable-partx --enable-write - --infodir=/usr/share/info --mandir=/usr/share/man" +configure_args="--enable-partx --enable-write" make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install" short_desc="Miscellaneous linux utilities" maintainer="Juan RP " diff --git a/templates/valgrind/template b/templates/valgrind/template index 94466ac393..d5b657b30b 100644 --- a/templates/valgrind/template +++ b/templates/valgrind/template @@ -4,7 +4,6 @@ sourcepkg=$pkgname version=3.4.1 distfiles="http://www.valgrind.org/downloads/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--mandir=/usr/share/man" make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install" short_desc="Tool for finding memory management bugs in programs" maintainer="Juan RP "