X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=rules.mk;h=32b0733b795851b46d46768c6ffd8ef49888dbf2;hb=ac0f1324b64f7310c31aecb5dbf23b3ae0d5a3e0;hp=e7433389b0214e6b90ca106c7bf3742ffbba2356;hpb=53aa807ae41e48fd71653c2d00083a44a8bca14c;p=petitboot

diff --git a/rules.mk b/rules.mk
index e743338..32b0733 100644
--- a/rules.mk
+++ b/rules.mk
@@ -49,7 +49,7 @@ discover_objs = discover/event.o discover/user-event.o discover/udev.o \
 
 # client objs
 ui_common_objs = ui/common/discover-client.o ui/common/loader.o \
-	ui/common/ui-system.o ui/common/url.o
+	ui/common/ui-system.o ui/common/timer.o ui/common/url.o
 ncurses_objs = ui/ncurses/nc-scr.o ui/ncurses/nc-menu.o \
 	 ui/ncurses/nc-ked.o ui/ncurses/nc-cui.o
 twin_objs = ui/twin/pb-twin.o
@@ -68,6 +68,7 @@ client_objs = $(lib_objs) $(ui_common_objs)
 all: $(uis) $(daemons) $(utils)
 
 # ncurses cui
+pb_cui_objs-y$(ENABLE_PS3) += ui/ncurses/pb-cui.o
 pb_cui_objs-$(ENABLE_PS3) += ui/ncurses/ps3-cui.o ui/common/ps3.o
 pb_cui_ldflags-$(ENABLE_PS3) += -lps3-utils
 
@@ -120,13 +121,13 @@ parser-test: $(parser_test)
 
 install: all $(rules) $(udhcpc)
 	$(INSTALL) -d $(DESTDIR)$(sbindir)/
-	$(INSTALL) $(daemons) $(uis) $(utils) $(DESTDIR)$(sbindir)/
+	$(INSTALL_PROGRAM) $(daemons) $(uis) $(utils) $(DESTDIR)$(sbindir)/
 	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/artwork/
-	$(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
+	$(INSTALL_DATA) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
 		$(DESTDIR)$(pkgdatadir)/artwork/
 	$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/utils
-	$(INSTALL) -m 644 $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
-	$(INSTALL) -m 644 $(top_srcdir)/$(udhcpc) $(DESTDIR)$(pkgdatadir)/utils
+	$(INSTALL_DATA) $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
+	$(INSTALL_DATA) $(top_srcdir)/$(udhcpc) $(DESTDIR)$(pkgdatadir)/utils
 
 dist: $(PACKAGE)-$(VERSION).tar.gz