Simplify features installation

Signed-off-by: Alexey Gladkov <[email protected]>

Author: legionus

Makefile.in

@@ -165,10 +165,10 @@ build-libs: $(LIBS)
 build-progs: build-libs $(PROGS) $(SCRIPTS)
 
 PROJECT_SUBDIRS = guess tools
-FEATURES_SUBDIRS = $(filter-out $(SKIP_FEATURES),$(notdir $(wildcard $(FEATURESDIR)/*)))
+FEATURES_SUBDIRS = $(filter-out README.md $(SKIP_FEATURES),$(notdir $(wildcard $(FEATURESDIR)/*)))
 
 build: $(addprefix $(dest_projectdir)/,$(PROJECT_SUBDIRS))
-build: $(addprefix $(dest_projectdir)/features/,$(FEATURES_SUBDIRS))
+build: $(addprefix $(dest_projectdir)/features/,README.md $(FEATURES_SUBDIRS))
 build: build-progs build-libs
 
 verify:
@@ -425,22 +425,16 @@ install: build-progs build-manpages installdirs
 	$(Q)cp -at "$(DESTDIR)$(sysconfdir)" -- $(addprefix $(dest_sysconfdir)/,$(SYSCONF_NAMES))
 	$(Q)cp -at "$(DESTDIR)$(rulesdir)" -- $(addprefix $(dest_rulesdir)/,$(RULE_NAMES))
 	$(Q)cp -at "$(DESTDIR)$(projectdir)" -- $(realpath $(addprefix $(dest_projectdir)/,$(PROJECT_SUBDIRS)))
-	$(Q)mkdir -p -- "$(DESTDIR)$(projectdir)/$(FEATURESDIR)"
+	$(Q)mkdir -p -- $(addprefix $(DESTDIR)$(projectdir)/$(FEATURESDIR)/,$(FEATURES_SUBDIRS))
 	$(Q)for n in $(FEATURES_SUBDIRS); do \
-		target="$(dest_projectdir)/$(FEATURESDIR)/$$n"; \
-		dest="$(DESTDIR)$(projectdir)/$(FEATURESDIR)/$$n"; \
-	        if [ -d "$$target" ]; then \
-	            mkdir -p -- "$$dest"; \
-	            find "$$target/" -mindepth 1 -maxdepth 1 \
-	                '(' \
-	                        '!' -name 'src' -a \
-	                        '!' -name 'tests'  \
-	                ')' \
-	                -exec cp -at "$$dest" -- '{}' '+'; \
-	        else \
-	            cp -aL -- "$$target" "$$dest"; \
-	        fi; \
-	    done;
+	   find "$(dest_projectdir)/$(FEATURESDIR)/$$n/" -mindepth 1 -maxdepth 1 \
+	     '(' \
+	        '!' -name 'src' -a \
+	        '!' -name 'tests'  \
+	     ')' \
+	     -exec cp -at "$(DESTDIR)$(projectdir)/$(FEATURESDIR)/$$n" -- '{}' '+'; \
+	done
+	$(Q)cp -at "$(DESTDIR)$(projectdir)/$(FEATURESDIR)" -- $(realpath $(dest_projectdir)/$(FEATURESDIR)/README.md)
 	$(Q)cp -at "$(DESTDIR)$(execdir)/$(FEATURESDIR)" -- $(wildcard $(dest_execdir)/$(FEATURESDIR)/*)
 	$(Q)cp -at "$(DESTDIR)$(runtimedir)/bin" -- $(addprefix $(dest_data_bindir)/,$(RUNTIME_BIN_NAMES))
 	$(Q)cp -at "$(DESTDIR)$(runtimedir)/sbin" -- $(addprefix $(dest_data_sbindir)/,$(RUNTIME_SBIN_NAMES))