Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lr5vD-0001J2-NK for qemu-devel@nongnu.org; Tue, 07 Apr 2009 03:40:39 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lr5v9-0001DC-Bw for qemu-devel@nongnu.org; Tue, 07 Apr 2009 03:40:39 -0400 Received: from [199.232.76.173] (port=42915 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lr5v9-0001Cz-8H for qemu-devel@nongnu.org; Tue, 07 Apr 2009 03:40:35 -0400 Received: from wa4ehsobe004.messaging.microsoft.com ([216.32.181.14]:30474 helo=WA4EHSOBE004.bigfish.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_MD5:16) (Exim 4.60) (envelope-from ) id 1Lr5v8-0004fN-TN for qemu-devel@nongnu.org; Tue, 07 Apr 2009 03:40:35 -0400 Received: from mail216-wa4 (localhost.localdomain [127.0.0.1]) by mail216-wa4-R.bigfish.com (Postfix) with ESMTP id 0F40417200A0 for ; Tue, 7 Apr 2009 07:40:23 +0000 (UTC) Received: from ausb3extmailp02.amd.com (ausb3extmailp02.amd.com [163.181.251.22]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail216-wa4.bigfish.com (Postfix) with ESMTP id 35D82C20052 for ; Tue, 7 Apr 2009 07:40:08 +0000 (UTC) Received: from ausb3twp02.amd.com ([163.181.250.38]) by ausb3extmailp02.amd.com (Switch-3.2.7/Switch-3.2.7) with ESMTP id n377e4Dq030173 for ; Tue, 7 Apr 2009 02:40:07 -0500 Received: from sausexbh2.amd.com (SAUSEXBH2.amd.com [163.181.22.102]) by ausb3twp02.amd.com (Tumbleweed MailGate 3.5.1) with ESMTP id 2946316A03C2 for ; Tue, 7 Apr 2009 02:40:00 -0500 (CDT) From: Christoph Egger Date: Tue, 7 Apr 2009 09:39:59 +0200 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_PNw2JNi4SACpk0N" Message-ID: <200904070939.59733.Christoph.Egger@amd.com> Subject: [Qemu-devel] [PATCH] buildsytem: consistently use install Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org --Boundary-00=_PNw2JNi4SACpk0N Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, attached patch makes qemu use install consistently. Signed-off-by: Christoph Egger -- ---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 --Boundary-00=_PNw2JNi4SACpk0N Content-Type: text/x-diff; charset="us-ascii"; name="qemu_build.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="qemu_build.diff" 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 \ --Boundary-00=_PNw2JNi4SACpk0N--