summaryrefslogtreecommitdiffstats
path: root/rules/networkmanager.make
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-03-05 10:21:55 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-03-05 10:21:55 +0100
commitbcadda8ce2e6130487ecdb07b82684b3d8ebf306 (patch)
tree25c55e6fa69f1738575f359bddd3e353536ee538 /rules/networkmanager.make
parent334ac09942fa552b3db8e524e17dd6fcce8a0798 (diff)
downloadptxdist-bcadda8ce2e6130487ecdb07b82684b3d8ebf306.tar.gz
ptxdist-bcadda8ce2e6130487ecdb07b82684b3d8ebf306.tar.xz
networkmanager: fix installing examples
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/networkmanager.make')
-rw-r--r--rules/networkmanager.make20
1 files changed, 6 insertions, 14 deletions
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index 46efa8233..460c02824 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -92,16 +92,16 @@ $(STATEDIR)/networkmanager.install:
ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
@cd $(NETWORKMANAGER_DIR)/examples/C/glib/ \
- && for FILE in `find -name "*-glib" -printf '%f\n'`; do \
- install -D -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
+ && for FILE in `find -type f -executable -printf '%f\n'`; do \
+ install -vD -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
done
- @cd $(NETWORKMANAGER_DIR)/examples/python/ \
+ @cd $(NETWORKMANAGER_DIR)/examples/python/dbus \
&& for FILE in `find -name "*.py" -printf '%f\n'`; do \
- install -D -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
+ install -vD -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
done
@cd $(NETWORKMANAGER_DIR)/examples/shell/ \
&& for FILE in `find -name "*.sh" -printf '%f\n'`; do \
- install -D -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
+ install -vD -m 755 "$${FILE}" "$(NETWORKMANAGER_PKGDIR)/usr/bin/nm-$${FILE}"; \
done
endif
@@ -188,15 +188,7 @@ endif
ifdef PTXCONF_NETWORKMANAGER_EXAMPLES
@cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
- && for FILE in `find -name "*-glib" -printf '%f\n'`; do \
- $(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/$${FILE}); \
- done
- @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
- && for FILE in `find -name "*.py" -printf '%f\n'`; do \
- $(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/$${FILE}); \
- done
- @cd $(NETWORKMANAGER_PKGDIR)/usr/bin/ \
- && for FILE in `find -name "*.sh" -printf '%f\n'`; do \
+ && for FILE in `find -name "nm-*-*" -printf '%f\n'`; do \
$(call install_copy, networkmanager, 0, 0, 0755, -, /usr/bin/$${FILE}); \
done
endif