From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Tue, 13 Jan 2009 01:31:40 +0000 (-0800)
Subject: Fix make install
X-Git-Tag: v1.0.0~933
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=44fe1998097c50802eeac0a831b0b730809ac4b0;hp=baf330c1024cc324c631594ab1a56f30d240b9fa

Fix make install

Fix the make target install.

Fixes errors like these:
  /usr/bin/install: cannot stat `petitboot': No such file or directory

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/rules.mk b/rules.mk
index 708c5a2..af6223b 100644
--- a/rules.mk
+++ b/rules.mk
@@ -58,12 +58,11 @@ parser-test: $(parser_test_objs)
 	$(LINK.o) -o $@ $^
 
 install: all
-	$(INSTALL) -D petitboot $(DESTDIR)$(sbindir)/petitboot
-	$(INSTALL) -D petitboot-udev-helper \
-		$(DESTDIR)$(sbindir)/petitboot-udev-helper
-	$(INSTALL) -Dd $(DESTDIR)$(pkgdatadir)/artwork/
-	$(INSTALL) -t $(DESTDIR)$(pkgdatadir)/artwork/ \
-		$(foreach a,$(artwork),$(top_srcdir)/artwork/$(a))
+	$(INSTALL) -d $(DESTDIR)$(sbindir)/
+	$(INSTALL) discover/pb-discover $(uis) $(DESTDIR)$(sbindir)/
+	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/artwork/
+	$(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
+		$(DESTDIR)$(pkgdatadir)/artwork/
 
 dist:	$(PACKAGE)-$(VERSION).tar.gz