Commit 308c359325f24e776eaf1c42aeb9b8abfeef68e6
1 parent
430415f2
Fix "make install prefix=/somewhere".
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2452 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
22 additions
and
22 deletions
configure
| @@ -559,28 +559,28 @@ if [ -x "`which texi2html`" ] && [ -x "`which pod2man`" ]; then | @@ -559,28 +559,28 @@ if [ -x "`which texi2html`" ] && [ -x "`which pod2man`" ]; then | ||
| 559 | fi | 559 | fi |
| 560 | 560 | ||
| 561 | if test "$mingw32" = "yes" ; then | 561 | if test "$mingw32" = "yes" ; then |
| 562 | -if test -z "$prefix" ; then | ||
| 563 | - prefix="/c/Program Files/Qemu" | ||
| 564 | -fi | ||
| 565 | -mandir="$prefix" | ||
| 566 | -datadir="$prefix" | ||
| 567 | -docdir="$prefix" | ||
| 568 | -bindir="$prefix" | 562 | + if test -z "$prefix" ; then |
| 563 | + prefix="/c/Program Files/Qemu" | ||
| 564 | + fi | ||
| 565 | + mansuffix="" | ||
| 566 | + datasuffix="" | ||
| 567 | + docsuffix="" | ||
| 568 | + binsuffix="" | ||
| 569 | else | 569 | else |
| 570 | -if test -z "$prefix" ; then | ||
| 571 | - prefix="/usr/local" | ||
| 572 | -fi | ||
| 573 | -mandir="$prefix/share/man" | ||
| 574 | -datadir="$prefix/share/qemu" | ||
| 575 | -docdir="$prefix/share/doc/qemu" | ||
| 576 | -bindir="$prefix/bin" | 570 | + if test -z "$prefix" ; then |
| 571 | + prefix="/usr/local" | ||
| 572 | + fi | ||
| 573 | + mansuffix="/share/man" | ||
| 574 | + datasuffix="/share/qemu" | ||
| 575 | + docsuffix="/share/doc/qemu" | ||
| 576 | + binsuffix="/bin" | ||
| 577 | fi | 577 | fi |
| 578 | 578 | ||
| 579 | echo "Install prefix $prefix" | 579 | echo "Install prefix $prefix" |
| 580 | -echo "BIOS directory $datadir" | ||
| 581 | -echo "binary directory $bindir" | 580 | +echo "BIOS directory $prefix$datasuffix" |
| 581 | +echo "binary directory $prefix$binsuffix" | ||
| 582 | if test "$mingw32" = "no" ; then | 582 | if test "$mingw32" = "no" ; then |
| 583 | -echo "Manual directory $mandir" | 583 | +echo "Manual directory $prefix$mansuffix" |
| 584 | echo "ELF interp prefix $interp_prefix" | 584 | echo "ELF interp prefix $interp_prefix" |
| 585 | fi | 585 | fi |
| 586 | echo "Source path $source_path" | 586 | echo "Source path $source_path" |
| @@ -640,11 +640,11 @@ echo "# Configured with: $0 $@" >> $config_mak | @@ -640,11 +640,11 @@ echo "# Configured with: $0 $@" >> $config_mak | ||
| 640 | echo "/* Automatically generated by configure - do not modify */" > $config_h | 640 | echo "/* Automatically generated by configure - do not modify */" > $config_h |
| 641 | 641 | ||
| 642 | echo "prefix=$prefix" >> $config_mak | 642 | echo "prefix=$prefix" >> $config_mak |
| 643 | -echo "bindir=$bindir" >> $config_mak | ||
| 644 | -echo "mandir=$mandir" >> $config_mak | ||
| 645 | -echo "datadir=$datadir" >> $config_mak | ||
| 646 | -echo "docdir=$docdir" >> $config_mak | ||
| 647 | -echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h | 643 | +echo "bindir=\${prefix}$binsuffix" >> $config_mak |
| 644 | +echo "mandir=\${prefix}$mansuffix" >> $config_mak | ||
| 645 | +echo "datadir=\${prefix}$datasuffix" >> $config_mak | ||
| 646 | +echo "docdir=\${prefix}$docsuffic" >> $config_mak | ||
| 647 | +echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h | ||
| 648 | echo "MAKE=$make" >> $config_mak | 648 | echo "MAKE=$make" >> $config_mak |
| 649 | echo "INSTALL=$install" >> $config_mak | 649 | echo "INSTALL=$install" >> $config_mak |
| 650 | echo "CC=$cc" >> $config_mak | 650 | echo "CC=$cc" >> $config_mak |