- fixed static patch; release 2

diff --git a/efivar-static.patch b/efivar-static.patch
index 946d43be84776220d168f6d2156d0ee53b0415ca..13000dedbb2c3f23de285153d4e38ebb3b9c502d 100644 (file)
--- 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 cffbdccb9d1d3a5ea4114edc94a0d883667c83ad..01eb7ce8d27283cd6bcc844a0877ae31b71e10be 100644 (file)
--- 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