From 26f75b5f0f5a0cf94e2805d025342eb70daa00d7 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Thu, 30 Aug 2007 21:53:51 -0400 Subject: [PATCH] Fixed glibc to only install linuxthreads documentation when we are actually using linuxthreads --- base/glibc/glibc.conf | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/base/glibc/glibc.conf b/base/glibc/glibc.conf index 3c23a8fd2..dc483483d 100644 --- a/base/glibc/glibc.conf +++ b/base/glibc/glibc.conf @@ -125,23 +125,31 @@ glibc_postmake() # if atstage native; then - # install locales and linuxthread manpages + # install locales # eval $MAKE localedata/install-locales cp ../localedata/SUPPORTED $root/usr/share/i18n/ - mkdir -p $root/usr/share/man/man3 - if [ -f /usr/bin/perl ] ; then - eval $MAKE -C ../linuxthreads/man \ - MANDIR=$root/usr/share/man/man3 all install - fi + + if [ "$SDECFG_PKG_GLIBC_TLS" != 1 ]; then + # install linuxthread manpages + # + mkdir -p $root/usr/share/man/man3 + if [ -f /usr/bin/perl ]; then + eval $MAKE -C ../linuxthreads/man \ + MANDIR=$root/usr/share/man/man3 all install + fi - # copy linuxthreads and crypt documentation + # copy linuxthreads documentation + # + cp ../linuxthreads/ChangeLog $docdir/ChangeLog.threads + cp ../linuxthreads/Changes $docdir/Changes.threads + cp ../linuxthreads/README $docdir/README.threads + cp ../linuxthreads/FAQ.html $docdir/FAQ-threads.html + cp -r ../linuxthreads/Examples $docdir/examples.threads + fi + + # copy crypt documentation # - cp ../linuxthreads/ChangeLog $docdir/ChangeLog.threads - cp ../linuxthreads/Changes $docdir/Changes.threads - cp ../linuxthreads/README $docdir/README.threads - cp ../linuxthreads/FAQ.html $docdir/FAQ-threads.html - cp -r ../linuxthreads/Examples $docdir/examples.threads cp ../crypt/README.ufc-crypt $docdir/README.crypt # NSCD Init script and config