From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Thu, 9 Jul 2009 17:40:43 +0000 (-0700)
Subject: makefile INSTALL variables
X-Git-Tag: v1.0.0~858
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=7043c5fcdf922b65dcef23bc03795dfd23e0dc61;ds=sidebyside

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 01771db..a1818d8 100644
--- 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 e743338..3a38957 100644
--- 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