[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] buildsytem: consistently use install
From: |
Aurelien Jarno |
Subject: |
Re: [Qemu-devel] [PATCH] buildsytem: consistently use install |
Date: |
Thu, 9 Apr 2009 01:16:26 +0200 |
User-agent: |
Mutt/1.5.18 (2008-05-17) |
On Tue, Apr 07, 2009 at 09:39:59AM +0200, Christoph Egger wrote:
>
> Hi,
>
> attached patch makes qemu use install consistently.
This patch looks interesting, but they are still some direct calls to
install in Makefile.target.
> Signed-off-by: Christoph Egger <address@hidden>
>
> --
> ---to satisfy European Law for business letters:
> Advanced Micro Devices GmbH
> Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
> Geschaeftsfuehrer: Jochen Polster, Thomas M. McCoy, Giuliano Meroni
> Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
> Registergericht Muenchen, HRB Nr. 43632
> Index: configure
> ===================================================================
> --- configure (revision 7015)
> +++ configure (working copy)
> @@ -1253,6 +1253,9 @@
> echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h
> echo "MAKE=$make" >> $config_mak
> echo "INSTALL=$install" >> $config_mak
> +echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak
> +echo "INSTALL_DATA=$install -m0644 -p" >> $config_mak
> +echo "INSTALL_PROG=$install -m0755 -p" >> $config_mak
> echo "CC=$cc" >> $config_mak
> echo "HOST_CC=$host_cc" >> $config_mak
> echo "AR=$ar" >> $config_mak
> Index: Makefile
> ===================================================================
> --- Makefile (revision 7015)
> +++ Makefile (working copy)
> @@ -241,30 +241,30 @@
> endif
>
> install-doc: $(DOCS)
> - mkdir -p "$(DESTDIR)$(docdir)"
> - $(INSTALL) -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)"
> + $(INSTALL_DIR) "$(DESTDIR)$(docdir)"
> + $(INSTALL_DATA) qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)"
> ifndef CONFIG_WIN32
> - mkdir -p "$(DESTDIR)$(mandir)/man1"
> - $(INSTALL) -m 644 qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
> - mkdir -p "$(DESTDIR)$(mandir)/man8"
> - $(INSTALL) -m 644 qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
> + $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
> + $(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
> + $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"
> + $(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
> endif
>
> install: all $(if $(BUILD_DOCS),install-doc)
> - mkdir -p "$(DESTDIR)$(bindir)"
> + $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
> ifneq ($(TOOLS),)
> - $(INSTALL) -m 755 $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
> + $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
> endif
> ifneq ($(BLOBS),)
> - mkdir -p "$(DESTDIR)$(datadir)"
> + $(INSTALL_DIR) "$(DESTDIR)$(datadir)"
> set -e; for x in $(BLOBS); do \
> - $(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x
> "$(DESTDIR)$(datadir)"; \
> + $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)";
> \
> done
> endif
> ifndef CONFIG_WIN32
> - mkdir -p "$(DESTDIR)$(datadir)/keymaps"
> + $(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps"
> set -e; for x in $(KEYMAPS); do \
> - $(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x
> "$(DESTDIR)$(datadir)/keymaps"; \
> + $(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x
> "$(DESTDIR)$(datadir)/keymaps"; \
> done
> endif
> for d in $(TARGET_DIRS); do \
--
Aurelien Jarno GPG: 1024D/F1BCDB73
address@hidden http://www.aurel32.net