| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From dea4a55714249b2734a36701120fd22c91c64ec2 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Sat, 7 May 2016 02:06:47 -0400 |
| 4 | Subject: [PATCH] Makefile: fix efivar.pc not found |
| 5 | |
| 6 | It fixes efivar.pc not found: |
| 7 | ... |
| 8 | | install -d -m 755 efivar/0.23-r0/image/usr/lib/pkgconfig/ |
| 9 | | install -m 644 efivar.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ |
| 10 | ; install -m 644 efiboot.pc efivar/0.23-r0/image/usr/lib/pkgconfig/ |
| 11 | ; |
| 12 | | install: cannot stat 'efivar.pc': No such file or directory |
| 13 | | install: cannot stat 'efiboot.pc': No such file or directory |
| 14 | | make[1]: *** [install] Error 1 |
| 15 | | make[1]: Leaving directory `efivar/0.23-r0/git/src' |
| 16 | | make: *** [install] Error 2 |
| 17 | | ERROR: oe_runmake failed |
| 18 | ... |
| 19 | |
| 20 | Upstream-Status: Pending |
| 21 | |
| 22 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 23 | |
| 24 | --- |
| 25 | src/Makefile | 4 +++- |
| 26 | 1 file changed, 3 insertions(+), 1 deletion(-) |
| 27 | |
| 28 | diff --git a/src/Makefile b/src/Makefile |
| 29 | index dcc7fc8..691aa8a 100644 |
| 30 | --- a/src/Makefile |
| 31 | +++ b/src/Makefile |
| 32 | @@ -94,7 +94,9 @@ install : all |
| 33 | ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x) ;\ |
| 34 | ) |
| 35 | $(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR) |
| 36 | - $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;) |
| 37 | + $(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(TOPDIR)/src/$(x).in $(DESTDIR)$(PCDIR)/$(x) ;\ |
| 38 | + sed -i -e "s:@@LIBDIR@@:$(libdir):g" -e "s:@@VERSION@@:$(VERSION):g" \ |
| 39 | + $(DESTDIR)$(PCDIR)/$(x); ) |
| 40 | $(INSTALL) -d -m 755 $(DESTDIR)$(includedir)/efivar |
| 41 | $(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(includedir)/efivar/$(notdir $(x));) |
| 42 | $(INSTALL) -d -m 755 $(DESTDIR)$(bindir) |