Skip to contentSkip to conversation

rapidjson: simplify install commands

PATCH New Philippe Proulx 3 participants 3 messages Nov 18, 2014

lore
Share & tools
lore

Philippe Proulx

author
#0 lore raw

PATCH 1/1 rapidjson: simplify install commands

Signed-off-by Philippe Proulx <[email protected]>
---
 package/rapidjson/rapidjson.mk | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
package/rapidjson/rapidjson.mk +1 -12
index ff516c4..6658da2 100644
@@ -12,18 +12,7 @@ RAPIDJSON_INSTALL_TARGET = NO
 RAPIDJSON_INSTALL_STAGING = YES
 
 define RAPIDJSON_INSTALL_STAGING_CMDS
-	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson
-	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/internal
-	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/error
-	$(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/msinttypes
-	$(INSTALL) -m 0644 $(@D)/include/rapidjson/*.h \
-		$(STAGING_DIR)/usr/include/rapidjson
-	$(INSTALL) -m 0644 $(@D)/include/rapidjson/internal/*.h \
-		$(STAGING_DIR)/usr/include/rapidjson/internal
-	$(INSTALL) -m 0644 $(@D)/include/rapidjson/error/*.h \
-		$(STAGING_DIR)/usr/include/rapidjson/error
-	$(INSTALL) -m 0644 $(@D)/include/rapidjson/msinttypes/*.h \
-		$(STAGING_DIR)/usr/include/rapidjson/msinttypes
+	cp -dpfr $(@D)/include/* $(STAGING_DIR)/usr/include
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.1.3
#1 lore raw

PATCH 1/1 rapidjson: simplify install commands

Quoted 1 line · Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Tested-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

(Checked that installed files are identical to the situation before this patch.)

Regards,
Arnout

Quoted 29 lines
---
 package/rapidjson/rapidjson.mk | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
package/rapidjson/rapidjson.mk +1 -12
index ff516c4..6658da2 100644
@@ -12,18 +12,7 @@ RAPIDJSON_INSTALL_TARGET = NO
 RAPIDJSON_INSTALL_STAGING = YES
 
 define RAPIDJSON_INSTALL_STAGING_CMDS
-    $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson
-    $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/internal
-    $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/error
-    $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/rapidjson/msinttypes
-    $(INSTALL) -m 0644 $(@D)/include/rapidjson/*.h \
-        $(STAGING_DIR)/usr/include/rapidjson
-    $(INSTALL) -m 0644 $(@D)/include/rapidjson/internal/*.h \
-        $(STAGING_DIR)/usr/include/rapidjson/internal
-    $(INSTALL) -m 0644 $(@D)/include/rapidjson/error/*.h \
-        $(STAGING_DIR)/usr/include/rapidjson/error
-    $(INSTALL) -m 0644 $(@D)/include/rapidjson/msinttypes/*.h \
-        $(STAGING_DIR)/usr/include/rapidjson/msinttypes
+    cp -dpfr $(@D)/include/* $(STAGING_DIR)/usr/include
 endef
 
 $(eval $(generic-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Applied
#2 lore raw

PATCH 1/1 rapidjson: simplify install commands

In reply to Philippe Proulx

Dear Philippe Proulx,

Quoted 4 lines · Philippe Proulx
Signed-off-by Philippe Proulx <[email protected]>
---
 package/rapidjson/rapidjson.mk | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com