Commit 1f50f8d1d4b7c3c6e86b149e1beba12da0b9cd27
1 parent
a1b74fe8
better install
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@789 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
14 additions
and
2 deletions
Makefile
| ... | ... | @@ -10,6 +10,9 @@ DEFINES+=-D_GNU_SOURCE |
| 10 | 10 | ifndef CONFIG_WIN32 |
| 11 | 11 | TOOLS=qemu-mkcow |
| 12 | 12 | endif |
| 13 | +ifdef CONFIG_STATIC | |
| 14 | +LDFLAGS+=-static | |
| 15 | +endif | |
| 13 | 16 | |
| 14 | 17 | all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1 |
| 15 | 18 | for d in $(TARGET_DIRS); do \ |
| ... | ... | @@ -17,7 +20,7 @@ all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1 |
| 17 | 20 | done |
| 18 | 21 | |
| 19 | 22 | qemu-mkcow: qemu-mkcow.c |
| 20 | - $(CC) $(CFLAGS) $(DEFINES) -o $@ $^ $(LIBS) | |
| 23 | + $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS) | |
| 21 | 24 | |
| 22 | 25 | dyngen$(EXESUF): dyngen.c |
| 23 | 26 | $(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^ |
| ... | ... | @@ -45,6 +48,8 @@ endif |
| 45 | 48 | mkdir -p "$(sharedir)" |
| 46 | 49 | install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \ |
| 47 | 50 | pc-bios/linux_boot.bin "$(sharedir)" |
| 51 | + mkdir -p "$(docdir)" | |
| 52 | + install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" | |
| 48 | 53 | ifndef CONFIG_WIN32 |
| 49 | 54 | mkdir -p "$(mandir)/man1" |
| 50 | 55 | install qemu.1 qemu-mkcow.1 "$(mandir)/man1" |
| ... | ... | @@ -86,9 +91,13 @@ tarbin: |
| 86 | 91 | $(prefix)/bin/qemu-arm \ |
| 87 | 92 | $(prefix)/bin/qemu-sparc \ |
| 88 | 93 | $(prefix)/bin/qemu-ppc \ |
| 94 | + $(prefix)/bin/qemu-mkcow \ | |
| 89 | 95 | $(sharedir)/bios.bin \ |
| 90 | 96 | $(sharedir)/vgabios.bin \ |
| 91 | - $(mandir)/man1/qemu.1 ) | |
| 97 | + $(sharedir)/linux_boot.bin \ | |
| 98 | + $(docdir)/qemu-doc.html \ | |
| 99 | + $(docdir)/qemu-tech.html \ | |
| 100 | + $(mandir)/man1/qemu.1 $(mandir)/man1/qemu-mkcow.1 ) | |
| 92 | 101 | |
| 93 | 102 | ifneq ($(wildcard .depend),) |
| 94 | 103 | include .depend | ... | ... |
configure
| ... | ... | @@ -266,6 +266,7 @@ if test -z "$prefix" ; then |
| 266 | 266 | fi |
| 267 | 267 | mandir="$prefix" |
| 268 | 268 | sharedir="$prefix" |
| 269 | +docdir="$prefix" | |
| 269 | 270 | bindir="$prefix" |
| 270 | 271 | else |
| 271 | 272 | if test -z "$prefix" ; then |
| ... | ... | @@ -273,6 +274,7 @@ if test -z "$prefix" ; then |
| 273 | 274 | fi |
| 274 | 275 | mandir="$prefix/share/man" |
| 275 | 276 | sharedir="$prefix/share/qemu" |
| 277 | +docdir="$prefix/share/doc/qemu" | |
| 276 | 278 | bindir="$prefix/bin" |
| 277 | 279 | fi |
| 278 | 280 | |
| ... | ... | @@ -314,6 +316,7 @@ echo "prefix=$prefix" >> $config_mak |
| 314 | 316 | echo "bindir=$bindir" >> $config_mak |
| 315 | 317 | echo "mandir=$mandir" >> $config_mak |
| 316 | 318 | echo "sharedir=$sharedir" >> $config_mak |
| 319 | +echo "docdir=$docdir" >> $config_mak | |
| 317 | 320 | echo "#define CONFIG_QEMU_SHAREDIR \"$sharedir\"" >> $config_h |
| 318 | 321 | echo "MAKE=$make" >> $config_mak |
| 319 | 322 | echo "CC=$cc" >> $config_mak | ... | ... |