From 46d7414a723e615e3858568079e0b9db4cf8dafc Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 10 Apr 2011 22:22:54 +0000 Subject: [PATCH] Changed openssh and libedit bep files to be able to find aclocal dir. --- dev-libs/libedit/libedit-20100424.bep | 4 +++- net-misc/openssh/openssh-5.8p1.bep | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dev-libs/libedit/libedit-20100424.bep b/dev-libs/libedit/libedit-20100424.bep index d56cd0b0c..f48954ddd 100644 --- a/dev-libs/libedit/libedit-20100424.bep +++ b/dev-libs/libedit/libedit-20100424.bep @@ -10,7 +10,9 @@ COPYRIGHT="1992-2010 The NetBSD Foundation, Inc." BUILD { cd libedit-20100424-3.0 autoreconf --force --install - ./configure --prefix=/boot/common --disable-shared + ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ + --disable-shared \ + --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man make } diff --git a/net-misc/openssh/openssh-5.8p1.bep b/net-misc/openssh/openssh-5.8p1.bep index c429a702f..5327b5a4a 100644 --- a/net-misc/openssh/openssh-5.8p1.bep +++ b/net-misc/openssh/openssh-5.8p1.bep @@ -11,11 +11,11 @@ BUILD { cd openssh-5.8p1 autoconf mkdir -p m4 - cp /boot/common/share/aclocal/libtool.m4 m4 - cp /boot/common/share/aclocal/ltoptions.m4 m4 - cp /boot/common/share/aclocal/ltversion.m4 m4 - cp /boot/common/share/aclocal/ltsugar.m4 m4 - cp /boot/common/share/aclocal/lt~obsolete.m4 m4 + cp `aclocal --print-ac-dir`/libtool.m4 m4 + cp `aclocal --print-ac-dir`/ltoptions.m4 m4 + cp `aclocal --print-ac-dir`/ltversion.m4 m4 + cp `aclocal --print-ac-dir`/ltsugar.m4 m4 + cp `aclocal --print-ac-dir`/lt~obsolete.m4 m4 echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac libtoolize --force --copy aclocal -I m4 @@ -29,7 +29,7 @@ BUILD { --includedir=`finddir B_COMMON_DIRECTORY`/include \ --datadir=`finddir B_COMMON_DATA_DIRECTORY` \ --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \ + --docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/doc \ --sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \ --with-default-path=${PATH} \ --with-md5-passwords \