Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lrh0S-0006iI-OM for qemu-devel@nongnu.org; Wed, 08 Apr 2009 19:16:32 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lrh0R-0006gz-Df for qemu-devel@nongnu.org; Wed, 08 Apr 2009 19:16:31 -0400 Received: from [199.232.76.173] (port=35756 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lrh0R-0006gw-8S for qemu-devel@nongnu.org; Wed, 08 Apr 2009 19:16:31 -0400 Received: from hall.aurel32.net ([88.191.82.174]:46214) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lrh0Q-00043y-QU for qemu-devel@nongnu.org; Wed, 08 Apr 2009 19:16:31 -0400 Date: Thu, 9 Apr 2009 01:16:26 +0200 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] buildsytem: consistently use install Message-ID: <20090408231626.GE23493@volta.aurel32.net> References: <200904070939.59733.Christoph.Egger@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <200904070939.59733.Christoph.Egger@amd.com> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christoph Egger Cc: qemu-devel@nongnu.org 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 > > -- > ---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