gwj / at91sam9263 · Commits

Commit 7efa43875d6f0f476f6e8d6af08087d4f295afcf

Authored by bellard
1 parent 44c513c4

better packaging support 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@797 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 17 additions and 17 deletions
Makefile
  View file @7efa438
@@ -45,9 +45,9 @@ install: all @@ -45,9 +45,9 @@ install: all
45 ifndef CONFIG_WIN32 45 ifndef CONFIG_WIN32
46 install -m 755 -s $(TOOLS) "$(bindir)" 46 install -m 755 -s $(TOOLS) "$(bindir)"
47 endif 47 endif
48 - mkdir -p "$(sharedir)" 48 + mkdir -p "$(datadir)"
49 install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \ 49 install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
50 - pc-bios/linux_boot.bin "$(sharedir)" 50 + pc-bios/linux_boot.bin "$(datadir)"
51 mkdir -p "$(docdir)" 51 mkdir -p "$(docdir)"
52 install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" 52 install -m 644 qemu-doc.html qemu-tech.html "$(docdir)"
53 ifndef CONFIG_WIN32 53 ifndef CONFIG_WIN32
@@ -85,16 +85,16 @@ tar: @@ -85,16 +85,16 @@ tar:
85 # generate a binary distribution 85 # generate a binary distribution
86 tarbin: 86 tarbin:
87 ( cd / ; tar zcvf ~/qemu-$(VERSION)-i386.tar.gz \ 87 ( cd / ; tar zcvf ~/qemu-$(VERSION)-i386.tar.gz \
88 - $(prefix)/bin/qemu $(prefix)/bin/qemu-fast \  
89 - $(prefix)/bin/qemu-system-ppc \  
90 - $(prefix)/bin/qemu-i386 \  
91 - $(prefix)/bin/qemu-arm \  
92 - $(prefix)/bin/qemu-sparc \  
93 - $(prefix)/bin/qemu-ppc \  
94 - $(prefix)/bin/qemu-mkcow \  
95 - $(sharedir)/bios.bin \  
96 - $(sharedir)/vgabios.bin \  
97 - $(sharedir)/linux_boot.bin \ 88 + $(bindir)/qemu $(bindir)/qemu-fast \
  89 + $(bindir)/qemu-system-ppc \
  90 + $(bindir)/qemu-i386 \
  91 + $(bindir)/qemu-arm \
  92 + $(bindir)/qemu-sparc \
  93 + $(bindir)/qemu-ppc \
  94 + $(bindir)/qemu-mkcow \
  95 + $(datadir)/bios.bin \
  96 + $(datadir)/vgabios.bin \
  97 + $(datadir)/linux_boot.bin \
98 $(docdir)/qemu-doc.html \ 98 $(docdir)/qemu-doc.html \
99 $(docdir)/qemu-tech.html \ 99 $(docdir)/qemu-tech.html \
100 $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-mkcow.1 ) 100 $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-mkcow.1 )
configure
  View file @7efa438
@@ -265,7 +265,7 @@ if test -z "$prefix" ; then @@ -265,7 +265,7 @@ if test -z "$prefix" ; then
265 prefix="/c/Program Files/Qemu" 265 prefix="/c/Program Files/Qemu"
266 fi 266 fi
267 mandir="$prefix" 267 mandir="$prefix"
268 -sharedir="$prefix" 268 +datadir="$prefix"
269 docdir="$prefix" 269 docdir="$prefix"
270 bindir="$prefix" 270 bindir="$prefix"
271 else 271 else
@@ -273,13 +273,13 @@ if test -z "$prefix" ; then @@ -273,13 +273,13 @@ if test -z "$prefix" ; then
273 prefix="/usr/local" 273 prefix="/usr/local"
274 fi 274 fi
275 mandir="$prefix/share/man" 275 mandir="$prefix/share/man"
276 -sharedir="$prefix/share/qemu" 276 +datadir="$prefix/share/qemu"
277 docdir="$prefix/share/doc/qemu" 277 docdir="$prefix/share/doc/qemu"
278 bindir="$prefix/bin" 278 bindir="$prefix/bin"
279 fi 279 fi
280 280
281 echo "Install prefix $prefix" 281 echo "Install prefix $prefix"
282 -echo "BIOS directory $sharedir" 282 +echo "BIOS directory $datadir"
283 echo "binary directory $bindir" 283 echo "binary directory $bindir"
284 if test "$mingw32" = "no" ; then 284 if test "$mingw32" = "no" ; then
285 echo "Manual directory $mandir" 285 echo "Manual directory $mandir"
@@ -315,9 +315,9 @@ echo "/* Automatically generated by configure - do not modify */" > $config_h @@ -315,9 +315,9 @@ echo "/* Automatically generated by configure - do not modify */" > $config_h
315 echo "prefix=$prefix" >> $config_mak 315 echo "prefix=$prefix" >> $config_mak
316 echo "bindir=$bindir" >> $config_mak 316 echo "bindir=$bindir" >> $config_mak
317 echo "mandir=$mandir" >> $config_mak 317 echo "mandir=$mandir" >> $config_mak
318 -echo "sharedir=$sharedir" >> $config_mak 318 +echo "datadir=$datadir" >> $config_mak
319 echo "docdir=$docdir" >> $config_mak 319 echo "docdir=$docdir" >> $config_mak
320 -echo "#define CONFIG_QEMU_SHAREDIR \"$sharedir\"" >> $config_h 320 +echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h
321 echo "MAKE=$make" >> $config_mak 321 echo "MAKE=$make" >> $config_mak
322 echo "CC=$cc" >> $config_mak 322 echo "CC=$cc" >> $config_mak
323 if test "$have_gcc3_options" = "yes" ; then 323 if test "$have_gcc3_options" = "yes" ; then