* [Qemu-devel] [PATCH] buildsytem: consistently use install
@ 2009-04-07 7:39 Christoph Egger
2009-04-08 23:16 ` Aurelien Jarno
2009-04-18 15:41 ` Anthony Liguori
0 siblings, 2 replies; 3+ messages in thread
From: Christoph Egger @ 2009-04-07 7:39 UTC (permalink / raw)
To: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 413 bytes --]
Hi,
attached patch makes qemu use install consistently.
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
--
---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
[-- Attachment #2: qemu_build.diff --]
[-- Type: text/x-diff, Size: 2324 bytes --]
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 \
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] buildsytem: consistently use install
2009-04-07 7:39 [Qemu-devel] [PATCH] buildsytem: consistently use install Christoph Egger
@ 2009-04-08 23:16 ` Aurelien Jarno
2009-04-18 15:41 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Aurelien Jarno @ 2009-04-08 23:16 UTC (permalink / raw)
To: Christoph Egger; +Cc: qemu-devel
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 <Christoph.Egger@amd.com>
>
> --
> ---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
aurelien@aurel32.net http://www.aurel32.net
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] buildsytem: consistently use install
2009-04-07 7:39 [Qemu-devel] [PATCH] buildsytem: consistently use install Christoph Egger
2009-04-08 23:16 ` Aurelien Jarno
@ 2009-04-18 15:41 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2009-04-18 15:41 UTC (permalink / raw)
To: qemu-devel
Christoph Egger wrote:
> Hi,
>
> attached patch makes qemu use install consistently.
>
> Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
>
>
Applied. Thanks.
--
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-18 15:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-07 7:39 [Qemu-devel] [PATCH] buildsytem: consistently use install Christoph Egger
2009-04-08 23:16 ` Aurelien Jarno
2009-04-18 15:41 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).