Commit 1f50f8d1 authored by bellard's avatar bellard
Browse files

better install


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@789 c046a42c-6fe2-441c-8c8c-71466251a162
parent a1b74fe8
...@@ -10,6 +10,9 @@ DEFINES+=-D_GNU_SOURCE ...@@ -10,6 +10,9 @@ DEFINES+=-D_GNU_SOURCE
ifndef CONFIG_WIN32 ifndef CONFIG_WIN32
TOOLS=qemu-mkcow TOOLS=qemu-mkcow
endif endif
ifdef CONFIG_STATIC
LDFLAGS+=-static
endif
all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1 all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1
for d in $(TARGET_DIRS); do \ 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
done done
qemu-mkcow: qemu-mkcow.c qemu-mkcow: qemu-mkcow.c
$(CC) $(CFLAGS) $(DEFINES) -o $@ $^ $(LIBS) $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
dyngen$(EXESUF): dyngen.c dyngen$(EXESUF): dyngen.c
$(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^ $(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^
...@@ -45,6 +48,8 @@ endif ...@@ -45,6 +48,8 @@ endif
mkdir -p "$(sharedir)" mkdir -p "$(sharedir)"
install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \ install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
pc-bios/linux_boot.bin "$(sharedir)" pc-bios/linux_boot.bin "$(sharedir)"
mkdir -p "$(docdir)"
install -m 644 qemu-doc.html qemu-tech.html "$(docdir)"
ifndef CONFIG_WIN32 ifndef CONFIG_WIN32
mkdir -p "$(mandir)/man1" mkdir -p "$(mandir)/man1"
install qemu.1 qemu-mkcow.1 "$(mandir)/man1" install qemu.1 qemu-mkcow.1 "$(mandir)/man1"
...@@ -86,9 +91,13 @@ tarbin: ...@@ -86,9 +91,13 @@ tarbin:
$(prefix)/bin/qemu-arm \ $(prefix)/bin/qemu-arm \
$(prefix)/bin/qemu-sparc \ $(prefix)/bin/qemu-sparc \
$(prefix)/bin/qemu-ppc \ $(prefix)/bin/qemu-ppc \
$(prefix)/bin/qemu-mkcow \
$(sharedir)/bios.bin \ $(sharedir)/bios.bin \
$(sharedir)/vgabios.bin \ $(sharedir)/vgabios.bin \
$(mandir)/man1/qemu.1 ) $(sharedir)/linux_boot.bin \
$(docdir)/qemu-doc.html \
$(docdir)/qemu-tech.html \
$(mandir)/man1/qemu.1 $(mandir)/man1/qemu-mkcow.1 )
ifneq ($(wildcard .depend),) ifneq ($(wildcard .depend),)
include .depend include .depend
......
...@@ -266,6 +266,7 @@ if test -z "$prefix" ; then ...@@ -266,6 +266,7 @@ if test -z "$prefix" ; then
fi fi
mandir="$prefix" mandir="$prefix"
sharedir="$prefix" sharedir="$prefix"
docdir="$prefix"
bindir="$prefix" bindir="$prefix"
else else
if test -z "$prefix" ; then if test -z "$prefix" ; then
...@@ -273,6 +274,7 @@ if test -z "$prefix" ; then ...@@ -273,6 +274,7 @@ if test -z "$prefix" ; then
fi fi
mandir="$prefix/share/man" mandir="$prefix/share/man"
sharedir="$prefix/share/qemu" sharedir="$prefix/share/qemu"
docdir="$prefix/share/doc/qemu"
bindir="$prefix/bin" bindir="$prefix/bin"
fi fi
...@@ -314,6 +316,7 @@ echo "prefix=$prefix" >> $config_mak ...@@ -314,6 +316,7 @@ echo "prefix=$prefix" >> $config_mak
echo "bindir=$bindir" >> $config_mak echo "bindir=$bindir" >> $config_mak
echo "mandir=$mandir" >> $config_mak echo "mandir=$mandir" >> $config_mak
echo "sharedir=$sharedir" >> $config_mak echo "sharedir=$sharedir" >> $config_mak
echo "docdir=$docdir" >> $config_mak
echo "#define CONFIG_QEMU_SHAREDIR \"$sharedir\"" >> $config_h echo "#define CONFIG_QEMU_SHAREDIR \"$sharedir\"" >> $config_h
echo "MAKE=$make" >> $config_mak echo "MAKE=$make" >> $config_mak
echo "CC=$cc" >> $config_mak echo "CC=$cc" >> $config_mak
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment