From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AI2a4-0004cz-Sb
	for qemu-devel@nongnu.org; Fri, 07 Nov 2003 04:07:00 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AI2ZT-00041D-KQ
	for qemu-devel@nongnu.org; Fri, 07 Nov 2003 04:06:54 -0500
Received: from [212.11.15.34] (helo=office.mandrakesoft.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AI2Z7-0003nQ-Sr
	for qemu-devel@nongnu.org; Fri, 07 Nov 2003 04:06:02 -0500
Received: from thalys.mandrakesoft.com (thalys.mandrakesoft.com
	[192.168.100.189])
	by office.mandrakesoft.com (Postfix) with ESMTP id F191535F
	for <qemu-devel@nongnu.org>; Fri,  7 Nov 2003 10:05:58 +0100 (CET)
Date: Fri, 7 Nov 2003 10:03:11 +0100 (CET)
From: Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
Message-ID: <Pine.LNX.4.50.0311071002030.9116-100000@thalys.mandrakesoft.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Subject: [Qemu-devel] [PATCH] DESTDIRify
Reply-To: qemu-devel@nongnu.org
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <http://mail.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://mail.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://mail.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Hi,

This patch renders make install DESTDIR aware. That helps for packages 
generation. At the same time, make sure there is actually something to 
install prior to proceeding.

Patch against 0.5.0

--- qemu-0.5.0/Makefile.DESTDIR	2003-10-28 01:53:12.000000000 +0100
+++ qemu-0.5.0/Makefile	2003-11-06 13:39:31.000000000 +0100
@@ -35,12 +35,12 @@ distclean: clean
         done
 
 install: all 
-	mkdir -p $(prefix)/bin
-	install -m 755 -s $(TOOLS) $(prefix)/bin
-	mkdir -p $(sharedir)
-	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin $(sharedir)
-	mkdir -p $(mandir)/man1
-	install qemu.1 $(mandir)/man1
+	mkdir -p $(DESTDIR)$(prefix)/bin
+	install -m 755 -s $(TOOLS) $(DESTDIR)$(prefix)/bin
+	mkdir -p $(DESTDIR)$(sharedir)
+	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin $(DESTDIR)$(sharedir)
+	mkdir -p $(DESTDIR)$(mandir)/man1
+	install qemu.1 $(DESTDIR)$(mandir)/man1
 	for d in $(TARGET_DIRS); do \
 	make -C $$d $@ || exit 1 ; \
         done
--- qemu-0.5.0/Makefile.target.DESTDIR	2003-11-06 13:23:32.000000000 +0100
+++ qemu-0.5.0/Makefile.target	2003-11-06 13:40:32.000000000 +0100
@@ -235,7 +235,9 @@
 	rm -f *.o  *.a *~ $(PROGS) gen-op.h opc.h op.h
 
 install: all 
+ifneq ($(PROGS),)
-	install -m 755 -s $(PROGS) $(prefix)/bin
+	install -m 755 -s $(PROGS) $(DESTDIR)$(prefix)/bin
+endif
 
 ifneq ($(wildcard .depend),)
 include .depend