From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1FPcqm-0004sN-1u
	for qemu-devel@nongnu.org; Sat, 01 Apr 2006 04:56:56 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1FPcqk-0004rD-1f
	for qemu-devel@nongnu.org; Sat, 01 Apr 2006 04:56:55 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1FPcqj-0004r6-QZ
	for qemu-devel@nongnu.org; Sat, 01 Apr 2006 04:56:53 -0500
Received: from [64.233.182.191] (helo=nproxy.gmail.com)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1FPctK-0004Vr-8J
	for qemu-devel@nongnu.org; Sat, 01 Apr 2006 04:59:34 -0500
Received: by nproxy.gmail.com with SMTP id k27so100038nfc
	for <qemu-devel@nongnu.org>; Sat, 01 Apr 2006 01:56:52 -0800 (PST)
Message-ID: <5393dd630604010156geca424cw89ced9098df90fc4@mail.gmail.com>
Date: Sat, 1 Apr 2006 11:56:52 +0200
From: "Patrick Mauritz" <patrick.mauritz@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_Part_26472_8529381.1143885412368"
Subject: [Qemu-devel] [PATCH] destdir support
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

------=_Part_26472_8529381.1143885412368
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

Hi,

the attached patch adds DESTDIR at the right places in the makefile,
which is suitable for packaging (build with --prefix=3D/usr, install
with make install DESTDIR=3D/foo, then you have the resulting tree in
/foo/usr/...)


patrick mauritz

------=_Part_26472_8529381.1143885412368
Content-Type: text/x-patch; name=20060401-destdir.patch; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Attachment-Id: f_elhoz8yf
Content-Disposition: attachment; filename="20060401-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),)

------=_Part_26472_8529381.1143885412368--