From ccd37737ebdabb7a68c1836856394767500ff38d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 29 Dec 2014 23:22:38 -0500 Subject: Mostly improve ./configure, a couple of related changes in Makefiles --- Makefile.d/build-release.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Makefile.d/build-release.mk') diff --git a/Makefile.d/build-release.mk b/Makefile.d/build-release.mk index 09c0808..b3fa125 100644 --- a/Makefile.d/build-release.mk +++ b/Makefile.d/build-release.mk @@ -23,31 +23,31 @@ dist_files = \ dist_dirs = docs bin resources distdir: PHONY \ - libreboot-$(VERSION)/version.txt \ - $(addprefix libreboot-$(VERSION)/utils/$(arch)/,$(dist_utils)) \ - $(addprefix libreboot-$(VERSION)/,$(dist_files) $(dist_dirs)) + $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/version.txt \ + $(addprefix $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/utils/$(arch)/,$(dist_utils)) \ + $(addprefix $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/,$(dist_files) $(dist_dirs)) -libreboot-$(VERSION)/utils/$(arch)/bucts: src/bucts/bucts +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/utils/$(arch)/bucts: src/bucts/bucts mkdir -p $(@D) cp $< $@ -libreboot-$(VERSION)/utils/$(arch)/flashrom_%: src/flashrom/flashrom_% +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/utils/$(arch)/flashrom_%: src/flashrom/flashrom_% mkdir -p $(@D) cp $< $@ -libreboot-$(VERSION)/utils/$(arch)/cbfstool: src/coreboot/util/cbfstool/cbfstool +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/utils/$(arch)/cbfstool: src/coreboot/util/cbfstool/cbfstool mkdir -p $(@D) cp $< $@ -libreboot-$(VERSION)/utils/$(arch)/nvramtool: src/coreboot/util/nvramtool/nvramtool +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/utils/$(arch)/nvramtool: src/coreboot/util/nvramtool/nvramtool mkdir -p $(@D) cp $< $@ -$(addprefix libreboot-$(VERSION)/,$(dist_files)): \ -libreboot-$(VERSION)/%: % +$(addprefix $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/,$(dist_files)): \ +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/%: % mkdir -p $(@D) cp $< $@ -$(addprefix libreboot-$(VERSION)/,$(dist_dirs)): \ -libreboot-$(VERSION)/%: % +$(addprefix $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/,$(dist_dirs)): \ +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/%: % mkdir -p $(@D) cp -r $< $@ -libreboot-$(VERSION)/version.txt: PHONY +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/version.txt: PHONY mkdir -p $(@D) echo $(VERSION) > $@ -- cgit v1.2.3