Unified · Split
| @@ -102,7 +102,7 @@ for opt do · 101 unmodified lines | ||
| 102 | 102 | ;; |
| 103 | 103 | --exec-prefix=*) execprefix=`echo $opt | cut -d '=' -f 2` |
| 104 | 104 | ;; |
| 105 | − --tccdir=*) tccdir=${libdir}/`echo $opt | cut -d '=' -f 2` | |
| 105 | + --tccdir=*) tccdir=`echo $opt | cut -d '=' -f 2` | |
| 106 | 106 | ;; |
| 107 | 107 | --bindir=*) bindir=`echo $opt | cut -d '=' -f 2` |
| 108 | 108 | ;; |
| @@ -110,10 +110,14 @@ for opt do · 1 unmodified line | ||
| 110 | 110 | ;; |
| 111 | 111 | --includedir=*) includedir=`echo $opt | cut -d '=' -f 2` |
| 112 | 112 | ;; |
| 113 | + --sharedir=*) sharedir=`echo $opt | cut -d '=' -f 2` | |
| 114 | + ;; | |
| 113 | 115 | --mandir=*) mandir=`echo $opt | cut -d '=' -f 2` |
| 114 | 116 | ;; |
| 115 | 117 | --infodir=*) infodir=`echo $opt | cut -d '=' -f 2` |
| 116 | 118 | ;; |
| 119 | + --docdir=*) docdir=`echo $opt | cut -d '=' -f 2` | |
| 120 | + ;; | |
| 117 | 121 | --sysroot=*) sysroot=`echo $opt | cut -d '=' -f 2` |
| 118 | 122 | ;; |
| 119 | 123 | --source-path=*) source_path=`echo $opt | cut -d '=' -f 2` |
| @@ -237,8 +241,10 @@ echo " --bindir=DIR user executables in DIR [EPREFIX/bin]" · 117 unmodified lines | ||
| 237 | 241 | echo " --libdir=DIR object code libraries in DIR [EPREFIX/lib]" |
| 238 | 242 | echo " --tccdir=DIR installation directory [EPREFIX/lib/tcc]" |
| 239 | 243 | echo " --includedir=DIR C header files in DIR [PREFIX/include]" |
| 240 | −echo " --mandir=DIR man documentation in DIR [PREFIX/man]" | |
| 241 | −echo " --infodir=DIR info documentation in DIR [PREFIX/info]" | |
| 244 | +echo " --sharedir=DIR documentation root DIR [PREFIX]" | |
| 245 | +echo " --docdir=DIR documentation in DIR [SHAREDIR/doc/tcc]" | |
| 246 | +echo " --mandir=DIR man documentation in DIR [SHAREDIR/man]" | |
| 247 | +echo " --infodir=DIR info documentation in DIR [SHAREDIR/info]" | |
| 242 | 248 | echo "" |
| 243 | 249 | echo "Advanced options (experts only):" |
| 244 | 250 | echo " --source-path=PATH path of source code [$source_path]" |
| @@ -260,45 +266,55 @@ echo "" · 15 unmodified lines | ||
| 260 | 266 | #echo "NOTE: The object files are build at the place where configure is launched" |
| 261 | 267 | exit 1 |
| 262 | 268 | fi |
| 263 | − | |
| 269 | + | |
| 264 | 270 | if test "$mingw32" = "yes" ; then |
| 265 | 271 | if test x"$tccdir" = x""; then |
| 266 | 272 | tccdir="tcc" |
| 267 | 273 | fi |
| 268 | 274 | if test -z "$prefix" ; then |
| 269 | − prefix="C:/Program Files/${tccdir}" | |
| 275 | + prefix="C:/Program Files/${tccdir}" | |
| 276 | + fi | |
| 277 | + if test -z "$sharedir" ; then | |
| 278 | + sharedir="${prefix}" | |
| 270 | 279 | fi |
| 271 | 280 | execprefix="$prefix" |
| 272 | − bindir="$prefix" | |
| 273 | − tccdir="$prefix" | |
| 274 | − docdir="$prefix/doc" | |
| 281 | + bindir="${prefix}" | |
| 282 | + tccdir="${prefix}" | |
| 283 | + libdir="${prefix}/lib" | |
| 284 | + docdir="${sharedir}/doc" | |
| 285 | + mandir="${sharedir}/man" | |
| 286 | + infodir="${sharedir}/info" | |
| 275 | 287 | else |
| 276 | − if test x"$tccdir" = x""; then | |
| 277 | − tccdir="${libdir}/tcc" | |
| 278 | − fi | |
| 279 | 288 | if test -z "$prefix" ; then |
| 280 | − prefix="/usr/local" | |
| 289 | + prefix="/usr/local" | |
| 290 | + fi | |
| 291 | + if test -z "$sharedir" ; then | |
| 292 | + sharedir="${prefix}" | |
| 281 | 293 | fi |
| 282 | 294 | if test x"$execprefix" = x""; then |
| 283 | − execprefix="${prefix}" | |
| 295 | + execprefix="${prefix}" | |
| 296 | + fi | |
| 297 | + if test x"$libdir" = x""; then | |
| 298 | + libdir="${execprefix}/lib" | |
| 284 | 299 | fi |
| 285 | 300 | if test x"$bindir" = x""; then |
| 286 | − bindir="${execprefix}/bin" | |
| 301 | + bindir="${execprefix}/bin" | |
| 302 | + fi | |
| 303 | + if test x"$tccdir" = x""; then | |
| 304 | + tccdir="tcc" | |
| 287 | 305 | fi |
| 288 | 306 | if test x"$docdir" = x""; then |
| 289 | − docdir="$prefix/share/doc/${tccdir}" | |
| 307 | + docdir="${sharedir}/doc/${tccdir}" | |
| 308 | + fi | |
| 309 | + if test x"$mandir" = x""; then | |
| 310 | + mandir="${sharedir}/man" | |
| 290 | 311 | fi |
| 312 | + if test x"$infodir" = x""; then | |
| 313 | + infodir="${sharedir}/info" | |
| 314 | + fi | |
| 315 | + tccdir="${libdir}/${tccdir}" | |
| 291 | 316 | fi # mingw32 |
| 292 | 317 | |
| 293 | −if test x"$libdir" = x""; then | |
| 294 | −libdir="${execprefix}/lib" | |
| 295 | −fi | |
| 296 | −if test x"$mandir" = x""; then | |
| 297 | −mandir="${prefix}/man" | |
| 298 | −fi | |
| 299 | −if test x"$infodir" = x""; then | |
| 300 | −infodir="${prefix}/info" | |
| 301 | −fi | |
| 302 | 318 | if test x"$includedir" = x""; then |
| 303 | 319 | includedir="${prefix}/include" |
| 304 | 320 | fi |
| @@ -308,7 +324,7 @@ echo "TinyCC directory $tccdir" · 3 unmodified lines | ||
| 308 | 324 | echo "Library directory $libdir" |
| 309 | 325 | echo "Include directory $includedir" |
| 310 | 326 | echo "Manual directory $mandir" |
| 311 | −echo "Info directory $infodir" | |
| 327 | +echo "Info directory $infodir" | |
| 312 | 328 | echo "Doc directory $docdir" |
| 313 | 329 | echo "Target root prefix $sysroot" |
| 314 | 330 | echo "Source path $source_path" |