From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FN60g-0000XM-5l for qemu-devel@nongnu.org; Sat, 25 Mar 2006 05:28:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FN60e-0000VS-Ar for qemu-devel@nongnu.org; Sat, 25 Mar 2006 05:28:41 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FN60e-0000VI-6C for qemu-devel@nongnu.org; Sat, 25 Mar 2006 05:28:40 -0500 Received: from [80.190.231.112] (helo=khepri.openbios.org) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1FN61f-0005E7-Hb for qemu-devel@nongnu.org; Sat, 25 Mar 2006 05:29:43 -0500 Received: from dslb-084-063-099-216.pools.arcor-ip.net ([84.63.99.216] helo=t-stueck.streichelzoo) by khepri.openbios.org with esmtps (TLSv1:DES-CBC3-SHA:168) (Exim 4.51) id 1FN60S-0006TH-Um for qemu-devel@nongnu.org; Sat, 25 Mar 2006 11:28:31 +0100 Received: from [192.168.1.202] ([192.168.1.202]) by t-stueck.streichelzoo (8.13.4+Sun/8.13.3) with ESMTP id k2PASMp1014296 for ; Sat, 25 Mar 2006 11:28:28 +0100 (CET) Message-ID: <44251B44.30607@studentenbude.ath.cx> From: Patrick Mauritz MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------090602060902070200060104" Subject: [Qemu-devel] [PATCH] add DESTDIR support to makefile Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sat, 25 Mar 2006 10:28:42 -0000 To: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------090602060902070200060104 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, the attached patch adds DESTDIR support to the makefile, so make install can be given a root prefix, eg. for packaging. patrick mauritz --------------090602060902070200060104 Content-Type: text/x-patch; name="20060325-destdir.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="20060325-destdir.patch" # # # patch "Makefile" # from [24ce1c8e1082fb804f509f5fd27617f226893745] # to [7249eece15dfa3b0c06aa0d0f2b916214fbe9226] # # patch "Makefile.target" # from [556cc7e70656a74d391e395e641eafed16ed2c88] # to [b414edd14d60c4dc7d00a55d38616613c83ff1b7] # ============================================================ --- Makefile 24ce1c8e1082fb804f509f5fd27617f226893745 +++ Makefile 7249eece15dfa3b0c06aa0d0f2b916214fbe9226 @@ -44,21 +44,21 @@ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr install: all - mkdir -p "$(bindir)" - install -m 755 -s $(TOOLS) "$(bindir)" - mkdir -p "$(datadir)" + mkdir -p "$(DESTDIR)$(bindir)" + install -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)" + mkdir -p "$(DESTDIR)$(datadir)" install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \ pc-bios/vgabios-cirrus.bin \ pc-bios/ppc_rom.bin pc-bios/video.x \ pc-bios/proll.elf \ - pc-bios/linux_boot.bin "$(datadir)" - mkdir -p "$(docdir)" - install -m 644 qemu-doc.html qemu-tech.html "$(docdir)" + pc-bios/linux_boot.bin "$(DESTDIR)$(datadir)" + mkdir -p "$(DESTDIR)$(docdir)" + install -m 644 qemu-doc.html qemu-tech.html "$(DESTDIR)$(docdir)" ifndef CONFIG_WIN32 - mkdir -p "$(mandir)/man1" - install qemu.1 qemu-img.1 "$(mandir)/man1" - mkdir -p "$(datadir)/keymaps" - install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(datadir)/keymaps" + mkdir -p "$(DESTDIR)$(mandir)/man1" + install qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1" + mkdir -p "$(DESTDIR)$(datadir)/keymaps" + install -m 644 $(addprefix keymaps/,$(KEYMAPS)) "$(DESTDIR)$(datadir)/keymaps" endif for d in $(TARGET_DIRS); do \ $(MAKE) -C $$d $@ || exit 1 ; \ ============================================================ --- Makefile.target 556cc7e70656a74d391e395e641eafed16ed2c88 +++ Makefile.target b414edd14d60c4dc7d00a55d38616613c83ff1b7 @@ -469,7 +469,7 @@ install: all ifneq ($(PROGS),) - install -m 755 -s $(PROGS) "$(bindir)" + install -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)" endif ifneq ($(wildcard .depend),) --------------090602060902070200060104--