make: Update to 4.2.1

[ipfire-3.x.git] / openssl / openssl.nm

diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index d9848e41b5ef0df1b94b31a1cbc3487fcfc0abea..aaf6b5388bee2a9dc57f5209927b267985e08f5c 100644 (file)
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -5,7 +5,7 @@
 
 name       = openssl
 version    = 1.0.2d
-release    = 2
+release    = 4
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Libraries
@@ -31,7 +31,7 @@ build
        end
 
        CFLAGS += -DPURIFY
-       export RPM_OPT_FLAGS = %{CFLAGS}
+       export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS}
 
        prepare_cmds
                sed -e 's/SHLIB_VERSION_NUMBER "1.0.0"/SHLIB_VERSION_NUMBER "%{version}"/' \
@@ -103,8 +103,10 @@ build
                mkdir -pv %{BUILDROOT}/usr/share
                mv -v %{BUILDROOT}/etc/pki/tls/man %{BUILDROOT}/usr/share/
 
-               mkdir -pv %{BUILDROOT}%{libdir}/openssl
-               mv -v %{BUILDROOT}%{libdir}/engines %{BUILDROOT}%{libdir}/openssl
+               if [ -d "%{BUILDROOT}%{libdir}/engines" ]; then
+                       mkdir -pv %{BUILDROOT}%{libdir}/openssl
+                       mv -v %{BUILDROOT}%{libdir}/engines %{BUILDROOT}%{libdir}/openssl
+               fi
 
                mkdir -pv %{BUILDROOT}/etc/pki/CA/private
                chmod -v 700 -R %{BUILDROOT}/etc/pki/CA