From 31aa4264d8839d05684e67a238837e8633d1e1bc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 5 Jun 2013 10:52:18 +0200 Subject: pkg-utils.mk: legal-license-file: handle multiple license files with same name Some packages (kmod, e2fsprogs, ..) contain multiple (different) license files with the same file name, but in different directories. These are currently all copied to the same filename in output/legal-info/licenses/, overwriting everything but the last file. Fix it by recreating the same directory structure under legal-info. Signed-off-by: Peter Korsgaard --- package/pkg-utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/pkg-utils.mk') diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 835c588af..86d687fb9 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -106,6 +106,6 @@ define legal-license-file # pkg, filename, file-fullpath $(call legal-license-header,$(1),$(2) file) && \ cat $(3) >>$(LEGAL_LICENSES_TXT) && \ echo >>$(LEGAL_LICENSES_TXT) && \ - mkdir -p $(LICENSE_FILES_DIR)/$(1)/ && \ - cp $(3) $(LICENSE_FILES_DIR)/$(1)/ + mkdir -p $(LICENSE_FILES_DIR)/$(1)/$(dir $(2)) && \ + cp $(3) $(LICENSE_FILES_DIR)/$(1)/$(2) endef -- cgit v1.2.3