Allow rebuild with DESTDIR
This commit is contained in:
parent
0adb08d7e8
commit
e44fa32914
@ -3,6 +3,7 @@
|
||||
- Add -g/--get option to download using only s_client
|
||||
- Always add REVISION value to installed certdata.txt
|
||||
- Use HG revision value (fall back to date for local files)
|
||||
- Allow rebuid within DESTDIR
|
||||
0.1 - Check executable bit for CERTUTIL, KEYTOOL, and OPENSSL
|
||||
- Allow global configuration file
|
||||
- Use correct license text (MIT)
|
||||
|
9
make-ca
9
make-ca
@ -192,11 +192,6 @@ function get_args(){
|
||||
echo "Error: ${1} cannot be used with the -C/--certdata or -g/--get switches."
|
||||
exit 3
|
||||
fi
|
||||
CERTDATA="${SSLDIR}/certdata.txt"
|
||||
if test ! -f "${CERTDATA}"; then
|
||||
echo "Error: ${CERTDATA} not found!"
|
||||
exit 3
|
||||
fi
|
||||
;;
|
||||
-s | --openssl)
|
||||
check_arg $1 $2
|
||||
@ -417,6 +412,10 @@ if test "${GET}" == "1"; then
|
||||
sed "1i # Revision:${REVISION}" -i "${CERTDATA}"
|
||||
fi
|
||||
|
||||
if test "${REBUILD}" == "1"; then
|
||||
CERTDATA="${DESTDIR}${SSLDIR}/certdata.txt"
|
||||
fi
|
||||
|
||||
if test ! -r "${CERTDATA}"; then
|
||||
echo "${CERTDATA} was not found. The certdata.txt file must be in the local"
|
||||
echo "directory, speficied with the -C/--certdata switch, or downloaded with"
|
||||
|
Loading…
Reference in New Issue
Block a user