gwj / at91sam9263 · Commits

Commit 1f50f8d1d4b7c3c6e86b149e1beba12da0b9cd27

Authored by bellard
1 parent a1b74fe8

better install 


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