From 040bfbcb57ef45f039c8ecff6a47277d33c295f3 Mon Sep 17 00:00:00 2001
From: william <william@25thandclement.com>
Date: Wed, 4 Mar 2015 18:42:28 -0800
Subject: readd pubkey.lua as a stub because the previous solution of using a
 symbolic link was causing packaging headaches

---
 src/GNUmakefile        | 11 +++++++++--
 src/openssl.pubkey.lua |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 src/openssl.pubkey.lua

(limited to 'src')

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 74a19fe..3fe2f65 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -123,8 +123,15 @@ $$(DESTDIR)$(3)/openssl/%.lua: $$(d)/openssl.%.lua
 	$$(MKDIR) -p $$(@D)
 	$$(CP) -p $$< $$@
 
-$$(DESTDIR)$(3)/openssl/pubkey.lua: $$(DESTDIR)$(3)/openssl/pkey.lua
-	cd $$(@D) && $(LN_S) -f $$(<F) $$(@F)
+# pubkey.lua used to be symbolic link to pkey.lua, but that caused packaging
+# headaches. Now it's a stub, but the cp -p in the inference rule will copy
+# to the target of the symbolic link, so we need a special install rule to
+# clean up the mess.
+$$(DESTDIR)$(3)/openssl/pubkey.lua: $$(d)/openssl.pubkey.lua
+	$$(LUAC$(1)_$(d)) -p $$<
+	$$(MKDIR) -p $$(@D)
+	$$(RM) -f $$@
+	$$(CP) -p $$< $$@
 
 $$(DESTDIR)$(3)/openssl/x509/%.lua: $$(d)/openssl.x509.%.lua
 	$$(LUAC$(1)_$(d)) -p $$<
diff --git a/src/openssl.pubkey.lua b/src/openssl.pubkey.lua
new file mode 100644
index 0000000..91bc8b9
--- /dev/null
+++ b/src/openssl.pubkey.lua
@@ -0,0 +1,2 @@
+-- for backwards compatibility
+return require "openssl.pkey"
-- 
cgit v1.2.3-59-g8ed1b