better packaging support

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@797 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile b/Makefile
index 808608d..7645c08 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,9 +45,9 @@ install: all
 ifndef CONFIG_WIN32
        install -m 755 -s $(TOOLS) "$(bindir)"
 endif
-       mkdir -p "$(sharedir)"
+       mkdir -p "$(datadir)"
        install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
-                       pc-bios/linux_boot.bin "$(sharedir)"
+                       pc-bios/linux_boot.bin "$(datadir)"
        mkdir -p "$(docdir)"
        install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
 ifndef CONFIG_WIN32
@@ -85,16 +85,16 @@ tar:
 # generate a binary distribution
 tarbin:
        ( cd / ; tar zcvf ~/qemu-$(VERSION)-i386.tar.gz \
-       $(prefix)/bin/qemu $(prefix)/bin/qemu-fast \
-       $(prefix)/bin/qemu-system-ppc \
-       $(prefix)/bin/qemu-i386 \
-        $(prefix)/bin/qemu-arm \
-        $(prefix)/bin/qemu-sparc \
-        $(prefix)/bin/qemu-ppc \
-        $(prefix)/bin/qemu-mkcow \
-       $(sharedir)/bios.bin \
-       $(sharedir)/vgabios.bin \
-       $(sharedir)/linux_boot.bin \
+       $(bindir)/qemu $(bindir)/qemu-fast \
+       $(bindir)/qemu-system-ppc \
+       $(bindir)/qemu-i386 \
+        $(bindir)/qemu-arm \
+        $(bindir)/qemu-sparc \
+        $(bindir)/qemu-ppc \
+        $(bindir)/qemu-mkcow \
+       $(datadir)/bios.bin \
+       $(datadir)/vgabios.bin \
+       $(datadir)/linux_boot.bin \
        $(docdir)/qemu-doc.html \
        $(docdir)/qemu-tech.html \
        $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-mkcow.1 )

diff --git a/configure b/configure
index 843e149..765b234 100755 (executable)
--- a/configure
+++ b/configure
@@ -265,7 +265,7 @@ if test -z "$prefix" ; then
     prefix="/c/Program Files/Qemu"
 fi
 mandir="$prefix"
-sharedir="$prefix"
+datadir="$prefix"
 docdir="$prefix"
 bindir="$prefix"
 else
@@ -273,13 +273,13 @@ if test -z "$prefix" ; then
     prefix="/usr/local"
 fi
 mandir="$prefix/share/man"
-sharedir="$prefix/share/qemu"
+datadir="$prefix/share/qemu"
 docdir="$prefix/share/doc/qemu"
 bindir="$prefix/bin"
 fi
 
 echo "Install prefix    $prefix"
-echo "BIOS directory    $sharedir"
+echo "BIOS directory    $datadir"
 echo "binary directory  $bindir"
 if test "$mingw32" = "no" ; then
 echo "Manual directory  $mandir"
@@ -315,9 +315,9 @@ echo "/* Automatically generated by configure - do not modify */" > $config_h
 echo "prefix=$prefix" >> $config_mak
 echo "bindir=$bindir" >> $config_mak
 echo "mandir=$mandir" >> $config_mak
-echo "sharedir=$sharedir" >> $config_mak
+echo "datadir=$datadir" >> $config_mak
 echo "docdir=$docdir" >> $config_mak
-echo "#define CONFIG_QEMU_SHAREDIR \"$sharedir\"" >> $config_h
+echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h
 echo "MAKE=$make" >> $config_mak
 echo "CC=$cc" >> $config_mak
 if test "$have_gcc3_options" = "yes" ; then