makefile INSTALL variables

Add more INSTALL variables to the makefile.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>

diff --git a/Makefile.in b/Makefile.in
index 01771dbf5396c5c7bb24fc652253aa6ce6fc8e5d..a1818d8c3e1df847a9734b1ea31278aa5bdd60d7 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,12 @@ ENABLE_PS3 = @ENABLE_PS3@
 
 # other programs
 INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 SHELL = @SHELL@
+STRIP = @STRIP@
 
 # paths
 prefix = @prefix@

diff --git a/rules.mk b/rules.mk
index e7433389b0214e6b90ca106c7bf3742ffbba2356..3a38957fe355032b9aa15a8dc20ec39e50003b42 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -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