Add generic UI countdown timer

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index e7433389b0214e6b90ca106c7bf3742ffbba2356..2bc5a30ea5a5f169ea3fcd6134f6edf92e77bb20 100644 (file)
--- 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
@@ -120,13 +120,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