TMPROOT in configure wird nicht mehr gebraucht
git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@6307 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
6961c9af8b
commit
8a607a81ec
@ -93,13 +93,7 @@ mk() {
|
||||
./configure --host=$TARGET \
|
||||
--prefix=/opt/squid \
|
||||
$ADDOPTIONS \
|
||||
--datadir=$TMPROOT/opt/squid/share \
|
||||
--sysconfdir=/etc/sysconfig/squid \
|
||||
--localstatedir=$TMPROOT/var \
|
||||
--includedir=$TMPROOT/include \
|
||||
--infodir=$TMPROOT/opt/squid/info \
|
||||
--mandir=$TMPROOT/opt/squid/man \
|
||||
--libexecdir=$TMPROOT/opt/squid/sbin \
|
||||
--sysconfdir=/etc/squid \
|
||||
--enable-gnuregex \
|
||||
--with-pthreads \
|
||||
--with-dl \
|
||||
@ -118,19 +112,20 @@ mk() {
|
||||
--enable-err-language=German \
|
||||
--enable-basic-auth-helpers="DB getpwnam LDAP MSNT multi-domain-NTLM NCSA PAM POP3 SMB squid_radius_auth YP"
|
||||
make -j $NUMCPU
|
||||
make -j $NUMCPU prefix=$TMPROOT/opt/squid \
|
||||
sysconfdir=$TMPROOT/etc/sysconfig/squid \
|
||||
localstatedir=$TMPROOT/var install
|
||||
make -j $NUMCPU prefix=/opt/squid \
|
||||
sysconfdir=/etc/sysconfig/squid \
|
||||
localstatedir=/var install
|
||||
CheckError "Make install process failed !" 1
|
||||
}
|
||||
|
||||
postmk() {
|
||||
#mv /etc/squid $TMPROOT/etc/
|
||||
#CheckError "postmk() failed !" 1
|
||||
cd $TMPROOT/etc/sysconfig/squid
|
||||
sed -e "s%$TMPROOT%%g" squid.conf >squid.conf~
|
||||
mv squid.conf~ squid.conf
|
||||
sed -e "s%$TMPROOT%%g" squid.conf.default >squid.conf.default~
|
||||
mv squid.conf.default~ squid.conf.default
|
||||
cd -
|
||||
#cd $TMPROOT/etc/sysconfig/squid
|
||||
#sed -e "s%$TMPROOT%%g" squid.conf >squid.conf~
|
||||
#mv squid.conf~ squid.conf
|
||||
#sed -e "s%$TMPROOT%%g" squid.conf.default >squid.conf.default~
|
||||
#mv squid.conf.default~ squid.conf.default
|
||||
#cd -
|
||||
echo "Nothing to do for postmk()"
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user