=================================================================== RCS file: /cvs/mandoc/configure,v retrieving revision 1.19 retrieving revision 1.22 diff -u -p -r1.19 -r1.22 --- mandoc/configure 2015/02/16 14:56:22 1.19 +++ mandoc/configure 2015/03/18 17:13:37 1.22 @@ -31,10 +31,6 @@ echo "config.log: writing..." # Initialize all variables here, # such that nothing can leak in from the environment. -VERSION="1.13.2" -echo "VERSION=\"${VERSION}\"" 1>&2 -echo "VERSION=\"${VERSION}\"" 1>&3 - OSNAME= CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | make -f -` @@ -241,9 +237,7 @@ elif [ -z "${DBLIB}" ]; then fi # --- manpath --- -if [ ${BUILD_DB} -eq 0 ]; then - HAVE_MANPATH=0 -elif ismanual manpath "${HAVE_MANPATH}"; then +if ismanual manpath "${HAVE_MANPATH}"; then : elif manpath 1>&3 2>&3; then echo "manpath: yes" 1>&2 @@ -277,7 +271,6 @@ __HEREDOC__ [ ${HAVE_FGETLN} -eq 0 ] && echo "#include " echo -echo "#define VERSION \"${VERSION}\"" [ -n "${OSNAME}" ] && echo "#define OSNAME \"${OSNAME}\"" [ -n "${HOMEBREWDIR}" ] && echo "#define HOMEBREWDIR \"${HOMEBREWDIR}\"" @@ -387,9 +380,9 @@ INSTALL_TARGETS="base-install" [ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-install" cat << __HEREDOC__ -VERSION = ${VERSION} BUILD_TARGETS = ${BUILD_TARGETS} INSTALL_TARGETS = ${INSTALL_TARGETS} +CC = ${CC} CFLAGS = ${CFLAGS} DBLIB = ${DBLIB} STATIC = ${STATIC}