aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarLibravatar william <william@25tandclement.com> 2014-03-27 22:57:09 -0700
committerLibravatarLibravatar william <william@25tandclement.com> 2014-03-27 22:57:09 -0700
commitea88fea73260424a1724a6ef5ecb0aa5dce68ba7 (patch)
tree62abe950e44cf911130426a4b7931e4e6a07f70b
parent8e755dcc092f0f46e7ff847d9672bfa7dde834c5 (diff)
downloadluaossl-ea88fea73260424a1724a6ef5ecb0aa5dce68ba7.tar.gz
luaossl-ea88fea73260424a1724a6ef5ecb0aa5dce68ba7.tar.bz2
luaossl-ea88fea73260424a1724a6ef5ecb0aa5dce68ba7.zip
rename pubkey.lua to pkey.lua and create symlink on install for backward compatability
-rw-r--r--GNUmakefile4
-rw-r--r--src/GNUmakefile4
-rw-r--r--src/openssl.pkey.lua4
3 files changed, 12 insertions, 0 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 9c1fece..113ef06 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -32,6 +32,8 @@ RANLIB ?= ranlib
M4 ?= m4
RM ?= rm
CP ?= cp
+LN ?= ln
+LN_S ?= $(LN) -s
RMDIR ?= rmdir
MKDIR ?= mkdir
CHMOD ?= chmod
@@ -62,6 +64,8 @@ $(d)/config:
printf 'M4 ?= $(value M4)'"\n" >> $(@D)/.config
printf 'RM ?= $(value RM)'"\n" >> $(@D)/.config
printf 'CP ?= $(value CP)'"\n" >> $(@D)/.config
+ printf 'LN ?= $(value LN)'"\n" >> $(@D)/.config
+ printf 'LN_S ?= $(value LN_S)'"\n" >> $(@D)/.config
printf 'RMDIR ?= $(value RMDIR)'"\n" >> $(@D)/.config
printf 'MKDIR ?= $(value MKDIR)'"\n" >> $(@D)/.config
printf 'CHMOD ?= $(value CHMOD)'"\n" >> $(@D)/.config
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 295eb89..76f045b 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -81,6 +81,7 @@ LUAC$(1)_$(d) = $$(or $$(call LUAPATH_$(d), $(1), luac), true)
MODS$(1)_$(d) = \
$$(DESTDIR)$(2)/_openssl.so \
$$(DESTDIR)$(3)/openssl/bignum.lua \
+ $$(DESTDIR)$(3)/openssl/pkey.lua \
$$(DESTDIR)$(3)/openssl/pubkey.lua \
$$(DESTDIR)$(3)/openssl/x509.lua \
$$(DESTDIR)$(3)/openssl/x509/name.lua \
@@ -105,6 +106,9 @@ $$(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)
+
$$(DESTDIR)$(3)/openssl/x509/%.lua: $$(d)/openssl.x509.%.lua
$$(LUAC$(1)_$(d)) -p $$<
$$(MKDIR) -p $$(@D)
diff --git a/src/openssl.pkey.lua b/src/openssl.pkey.lua
new file mode 100644
index 0000000..2cbd6d2
--- /dev/null
+++ b/src/openssl.pkey.lua
@@ -0,0 +1,4 @@
+local pkey = require"_openssl.pkey"
+
+return pkey
+