From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 16 Oct 2018 19:37:25 +0000 (+0200)
Subject: - fixed static patch; release 2
X-Git-Tag: auto/th/efivar-36-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fefivar.git;a=commitdiff_plain;h=1d745926af1d230b457e12d07d5943d6575538da

- fixed static patch; release 2
---

diff --git a/efivar-static.patch b/efivar-static.patch
index 946d43b..13000de 100644
--- a/efivar-static.patch
+++ b/efivar-static.patch
@@ -4,14 +4,14 @@
  		ln -fs $(x).1.$(VERSION) $(DESTDIR)$(LIBDIR)/$(x).1 ;\
  		ln -fs $(x).1.$(VERSION) $(DESTDIR)$(LIBDIR)/$(x) ;\
  		)
-+	$(foreach x, $(STATICLIBTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(libdir);)
++	$(foreach x, $(STATICLIBTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(LIBDIR);)
  	$(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR)
  	$(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;)
  	$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/efivar
  	$(foreach x, $(wildcard $(TOPDIR)/src/include/efivar/*.h), $(INSTALL) -m 644 $(x) $(DESTDIR)$(INCLUDEDIR)/efivar/$(notdir $(x));)
  	$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
  	$(foreach x, $(BINTARGETS), $(INSTALL) -m 755 $(x) $(DESTDIR)$(BINDIR);)
-+	$(foreach x, $(STATICBINTARGETS), $(INSTALL) -m 755 $(x) $(DESTDIR)$(bindir);)
++	$(foreach x, $(STATICBINTARGETS), $(INSTALL) -m 755 $(x) $(DESTDIR)$(BINDIR);)
  
  test : all
  	$(MAKE) -C test $@
diff --git a/efivar.spec b/efivar.spec
index cffbdcc..01eb7ce 100644
--- a/efivar.spec
+++ b/efivar.spec
@@ -7,7 +7,7 @@ Summary:	Tools to manage UEFI variables
 Summary(pl.UTF-8):	Narzędzia do zarządzania zmiennymi UEFI
 Name:		efivar
 Version:	36
-Release:	1
+Release:	2
 License:	LGPL v2.1
 Group:		Applications/System
 #Source0Download: https://github.com/rhinstaller/efivar/releases
@@ -79,7 +79,7 @@ Statyczna biblioteka efivar.
 	LDFLAGS="%{rpmldflags} -Wl,-z,muldefs" \
 	%{!?with_static:STATICBINTARGETS=} \
 	%{!?with_static_libs:STATICLIBTARGETS=} \
-	libdir=%{_libdir}
+	LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -88,7 +88,7 @@ rm -rf $RPM_BUILD_ROOT
 	DESTDIR=$RPM_BUILD_ROOT \
 	%{!?with_static:STATICBINTARGETS=} \
 	%{!?with_static_libs:STATICLIBTARGETS=} \
-	libdir=%{_libdir}
+	LIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT