Revision 6aae2a2e

b/Makefile
294 294
	$(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
295 295
endif
296 296
ifneq ($(BLOBS),)
297
	$(INSTALL_DIR) "$(DESTDIR)$(datadir)"
297
	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)"
298 298
	set -e; for x in $(BLOBS); do \
299
		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
299
		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \
300 300
	done
301 301
endif
302
	$(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps"
302
	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
303 303
	set -e; for x in $(KEYMAPS); do \
304
		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
304
		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
305 305
	done
306 306
	for d in $(TARGET_DIRS); do \
307 307
	$(MAKE) -C $$d $@ || exit 1 ; \
b/Makefile.target
485 485
endif
486 486
endif
487 487
ifdef CONFIG_TRACE_SYSTEMTAP
488
	$(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset"
489
	$(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset"
488
	$(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
489
	$(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
490 490
endif
491 491

  
492 492
# Include automatically generated dependency files
b/configure
3022 3022
echo "libdir=$libdir" >> $config_host_mak
3023 3023
echo "includedir=$includedir" >> $config_host_mak
3024 3024
echo "mandir=$mandir" >> $config_host_mak
3025
echo "datadir=$qemu_datadir" >> $config_host_mak
3025
echo "qemu_datadir=$qemu_datadir" >> $config_host_mak
3026 3026
echo "sysconfdir=$sysconfdir" >> $config_host_mak
3027 3027
echo "docdir=$qemu_docdir" >> $config_host_mak
3028 3028
echo "confdir=$qemu_confdir" >> $config_host_mak

Also available in: Unified diff