Commit 6a8826434fb98d7bcf870d9f3e2e90a672bc9f03
1 parent
a03a6053
Allow user to specify "install" utility.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1823 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
3 changed files
with
12 additions
and
6 deletions
Makefile
| ... | ... | @@ -45,20 +45,20 @@ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr |
| 45 | 45 | |
| 46 | 46 | install: all |
| 47 | 47 | mkdir -p "$(DESTDIR)$(bindir)" |
| 48 | - install -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" | |
| 48 | + $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" | |
| 49 | 49 | mkdir -p "$(DESTDIR)$(datadir)" |
| 50 | 50 | for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ |
| 51 | 51 | video.x proll.elf linux_boot.bin; do \ |
| 52 | - install -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ | |
| 52 | + $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \ | |
| 53 | 53 | done |
| 54 | 54 | mkdir -p "$(DESTDIR)$(docdir)" |
| 55 | - install -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" | |
| 55 | + $(INSTALL) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" | |
| 56 | 56 | ifndef CONFIG_WIN32 |
| 57 | 57 | mkdir -p "$(DESTDIR)$(mandir)/man1" |
| 58 | - install qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" | |
| 58 | + $(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" | |
| 59 | 59 | mkdir -p "$(DESTDIR)$(datadir)/keymaps" |
| 60 | 60 | for x in $(KEYMAPS); do \ |
| 61 | - install -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ | |
| 61 | + $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \ | |
| 62 | 62 | done |
| 63 | 63 | endif |
| 64 | 64 | for d in $(TARGET_DIRS); do \ | ... | ... |
Makefile.target
configure
| ... | ... | @@ -25,6 +25,7 @@ cc="gcc" |
| 25 | 25 | host_cc="gcc" |
| 26 | 26 | ar="ar" |
| 27 | 27 | make="make" |
| 28 | +install="install" | |
| 28 | 29 | strip="strip" |
| 29 | 30 | cpu=`uname -m` |
| 30 | 31 | target_list="" |
| ... | ... | @@ -172,6 +173,8 @@ for opt do |
| 172 | 173 | ;; |
| 173 | 174 | --make=*) make="$optarg" |
| 174 | 175 | ;; |
| 176 | + --install=*) install="$optarg" | |
| 177 | + ;; | |
| 175 | 178 | --extra-cflags=*) CFLAGS="$optarg" |
| 176 | 179 | ;; |
| 177 | 180 | --extra-ldflags=*) LDFLAGS="$optarg" |
| ... | ... | @@ -256,6 +259,7 @@ echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]" |
| 256 | 259 | echo " --cc=CC use C compiler CC [$cc]" |
| 257 | 260 | echo " --host-cc=CC use C compiler CC [$host_cc] for dyngen etc." |
| 258 | 261 | echo " --make=MAKE use specified make [$make]" |
| 262 | +echo " --install=INSTALL use specified install [$install]" | |
| 259 | 263 | echo " --static enable static build [$static]" |
| 260 | 264 | echo " --enable-cocoa enable COCOA (Mac OS X only)" |
| 261 | 265 | echo " --enable-mingw32 enable Win32 cross compilation with mingw32" |
| ... | ... | @@ -447,6 +451,7 @@ echo "Source path $source_path" |
| 447 | 451 | echo "C compiler $cc" |
| 448 | 452 | echo "Host C compiler $host_cc" |
| 449 | 453 | echo "make $make" |
| 454 | +echo "install $install" | |
| 450 | 455 | echo "host CPU $cpu" |
| 451 | 456 | echo "host big endian $bigendian" |
| 452 | 457 | echo "target list $target_list" |
| ... | ... | @@ -502,6 +507,7 @@ echo "datadir=$datadir" >> $config_mak |
| 502 | 507 | echo "docdir=$docdir" >> $config_mak |
| 503 | 508 | echo "#define CONFIG_QEMU_SHAREDIR \"$datadir\"" >> $config_h |
| 504 | 509 | echo "MAKE=$make" >> $config_mak |
| 510 | +echo "INSTALL=$install" >> $config_mak | |
| 505 | 511 | echo "CC=$cc" >> $config_mak |
| 506 | 512 | if test "$have_gcc3_options" = "yes" ; then |
| 507 | 513 | echo "HAVE_GCC3_OPTIONS=yes" >> $config_mak | ... | ... |