diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2021-07-17 14:03:40 +0200 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2021-07-17 14:03:44 +0200 |
| commit | f37006c2e641882dde01512f8a035bf42c6f46b8 (patch) | |
| tree | 5bb125fab4fbe9e6c768664633dd66317da7cafb | |
| parent | 977109e28613820ff451908289ff6e4cc671ec32 (diff) | |
sane-backends: use macros (properly), remove chmod
- use $(INSTALL_DIR) instead of mkdir
- using $(INSTALL_CONF) and then running chmod is pointless, use
$(INSTALL_DATA) directly
- /etc/xinetd.d/sane-port doesn't need read protection from non-root
users, use $(INSTALL_DATA) as well
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
| -rw-r--r-- | utils/sane-backends/Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/utils/sane-backends/Makefile b/utils/sane-backends/Makefile index 7bac49fc7..82acefcb2 100644 --- a/utils/sane-backends/Makefile +++ b/utils/sane-backends/Makefile @@ -187,13 +187,13 @@ CONFIGURE_VARS += \ ac_cv_func_mmap_fixed_mapped="yes" define Build/Configure - mkdir -p $(PKG_BUILD_DIR)/backend/.libs + $(INSTALL_DIR) $(PKG_BUILD_DIR)/backend/.libs $(Build/Configure/Default) endef define Build/Install $(call Build/Install/Default) - mkdir -p $(PKG_INSTALL_DIR)/usr/share/sane + $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/share/sane cd $(PKG_BUILD_DIR)/doc/descriptions && for file in *.desc; do \ sed -rn -e '/^:usbid[[:blank:]]+"?0x(....)"?[[:blank:]]+"?0x(....)"?.*/{s//\1 \2/;p}' $$$$file | \ sort -u > $(PKG_INSTALL_DIR)/usr/share/sane/$$$${file/\.desc/}.usbid; \ @@ -207,8 +207,7 @@ define Package/libsane/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsane.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/sane/libsane-dll.so.* $(1)/usr/lib/sane/ $(INSTALL_DIR) $(1)/etc/sane.d/dll.d - $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sane.d/dll.conf $(1)/etc/sane.d/ - chmod 0644 $(1)/etc/sane.d/dll.conf + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/sane.d/dll.conf $(1)/etc/sane.d/ endef define Package/libsane/conffiles @@ -217,14 +216,13 @@ endef define Package/sane-daemon/install $(INSTALL_DIR) $(1)/etc/sane.d - $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sane.d/saned.conf $(1)/etc/sane.d/ - chmod 0644 $(1)/etc/sane.d/saned.conf + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/sane.d/saned.conf $(1)/etc/sane.d/ $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) ./files/saned.sbin $(1)/usr/sbin/saned $(INSTALL_DIR) $(1)/usr/lib/sane/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/saned $(1)/usr/lib/sane/saned $(INSTALL_DIR) $(1)/etc/xinetd.d - $(INSTALL_CONF) ./files/saned.xinetd $(1)/etc/xinetd.d/sane-port + $(INSTALL_DATA) ./files/saned.xinetd $(1)/etc/xinetd.d/sane-port $(INSTALL_DIR) $(1)/etc/hotplug.d/usb/ $(INSTALL_BIN) ./files/saned.hotplug $(1)/etc/hotplug.d/usb/20-saned endef @@ -274,8 +272,7 @@ This package contains the SANE backend for $(2). define Package/sane-$(1)/install if [ -f "$(PKG_INSTALL_DIR)/etc/sane.d/$(1).conf" ]; then \ $(INSTALL_DIR) $$(1)/etc/sane.d ; \ - $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/sane.d/$(1).conf $$(1)/etc/sane.d/ ; \ - chmod 0644 $$(1)/etc/sane.d/$(1).conf ; \ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/sane.d/$(1).conf $$(1)/etc/sane.d/ ; \ fi ; \ $(INSTALL_DIR) $$(1)/usr/lib/sane ; \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/sane/libsane-$(1).so.* $$(1)/usr/lib/sane/ ; \ |