david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow user to specify "install" utility.

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1823 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2006-04-17 13:57:12 +00:00
parent a03a60532a
commit 6a8826434f
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -45,20 +45,20 @@ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr
install: all install: all
mkdir -p "$(DESTDIR)$(bindir)" mkdir -p "$(DESTDIR)$(bindir)"
install -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
mkdir -p "$(DESTDIR)$(datadir)" mkdir -p "$(DESTDIR)$(datadir)"
for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
video.x proll.elf linux_boot.bin; do \ video.x proll.elf linux_boot.bin; do \
install -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
done done
mkdir -p "$(DESTDIR)$(docdir)" mkdir -p "$(DESTDIR)$(docdir)"
install -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" $(INSTALL) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)"
ifndef CONFIG_WIN32 ifndef CONFIG_WIN32
mkdir -p "$(DESTDIR)$(mandir)/man1" mkdir -p "$(DESTDIR)$(mandir)/man1"
install qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" $(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
mkdir -p "$(DESTDIR)$(datadir)/keymaps" mkdir -p "$(DESTDIR)$(datadir)/keymaps"
for x in $(KEYMAPS); do \ for x in $(KEYMAPS); do \
install -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
done done
endif endif
for d in $(TARGET_DIRS); do \ for d in $(TARGET_DIRS); do \

2
Makefile.target
View File

@ -470,7 +470,7 @@ clean:
install: all install: all
ifneq ($(PROGS),) ifneq ($(PROGS),)
install -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
endif endif
ifneq ($(wildcard .depend),) ifneq ($(wildcard .depend),)

6
configure vendored
View File

@ -25,6 +25,7 @@ cc="gcc"
host_cc="gcc" host_cc="gcc"
ar="ar" ar="ar"
make="make" make="make"
install="install"
strip="strip" strip="strip"
cpu=`uname -m` cpu=`uname -m`
target_list="" target_list=""
@ -172,6 +173,8 @@ for opt do
;; ;;
--make=*) make="$optarg" --make=*) make="$optarg"
;; ;;
--install=*) install="$optarg"
;;
--extra-cflags=*) CFLAGS="$optarg" --extra-cflags=*) CFLAGS="$optarg"
;; ;;
--extra-ldflags=*) LDFLAGS="$optarg" --extra-ldflags=*) LDFLAGS="$optarg"
@ -256,6 +259,7 @@ echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"
echo " --cc=CC use C compiler CC [$cc]" echo " --cc=CC use C compiler CC [$cc]"
echo " --host-cc=CC use C compiler CC [$host_cc] for dyngen etc." echo " --host-cc=CC use C compiler CC [$host_cc] for dyngen etc."
echo " --make=MAKE use specified make [$make]" echo " --make=MAKE use specified make [$make]"
echo " --install=INSTALL use specified install [$install]"
echo " --static enable static build [$static]" echo " --static enable static build [$static]"
echo " --enable-cocoa enable COCOA (Mac OS X only)" echo " --enable-cocoa enable COCOA (Mac OS X only)"
echo " --enable-mingw32 enable Win32 cross compilation with mingw32" echo " --enable-mingw32 enable Win32 cross compilation with mingw32"
@ -447,6 +451,7 @@ echo "Source path $source_path"
echo "C compiler $cc" echo "C compiler $cc"
echo "Host C compiler $host_cc" echo "Host C compiler $host_cc"
echo "make $make" echo "make $make"
echo "install $install"
echo "host CPU $cpu" echo "host CPU $cpu"
echo "host big endian $bigendian" echo "host big endian $bigendian"
echo "target list $target_list" echo "target list $target_list"
@ -502,6 +507,7 @@ echo "datadir=$datadir" >> $config_mak
echo "docdir=$docdir" >> $config_mak echo "docdir=$docdir" >> $config_mak
echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h
echo "MAKE=$make" >> $config_mak echo "MAKE=$make" >> $config_mak
echo "INSTALL=$install" >> $config_mak
echo "CC=$cc" >> $config_mak echo "CC=$cc" >> $config_mak
if test "$have_gcc3_options" = "yes" ; then if test "$have_gcc3_options" = "yes" ; then
echo "HAVE_GCC3_OPTIONS=yes" >> $config_mak echo "HAVE_GCC3_OPTIONS=yes" >> $config_mak