summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwilliam <william@25tandclement.com>2014-03-27 22:57:09 -0700
committerwilliam <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
32M4 ?= m4 32M4 ?= m4
33RM ?= rm 33RM ?= rm
34CP ?= cp 34CP ?= cp
35LN ?= ln
36LN_S ?= $(LN) -s
35RMDIR ?= rmdir 37RMDIR ?= rmdir
36MKDIR ?= mkdir 38MKDIR ?= mkdir
37CHMOD ?= chmod 39CHMOD ?= chmod
@@ -62,6 +64,8 @@ $(d)/config:
62 printf 'M4 ?= $(value M4)'"\n" >> $(@D)/.config 64 printf 'M4 ?= $(value M4)'"\n" >> $(@D)/.config
63 printf 'RM ?= $(value RM)'"\n" >> $(@D)/.config 65 printf 'RM ?= $(value RM)'"\n" >> $(@D)/.config
64 printf 'CP ?= $(value CP)'"\n" >> $(@D)/.config 66 printf 'CP ?= $(value CP)'"\n" >> $(@D)/.config
67 printf 'LN ?= $(value LN)'"\n" >> $(@D)/.config
68 printf 'LN_S ?= $(value LN_S)'"\n" >> $(@D)/.config
65 printf 'RMDIR ?= $(value RMDIR)'"\n" >> $(@D)/.config 69 printf 'RMDIR ?= $(value RMDIR)'"\n" >> $(@D)/.config
66 printf 'MKDIR ?= $(value MKDIR)'"\n" >> $(@D)/.config 70 printf 'MKDIR ?= $(value MKDIR)'"\n" >> $(@D)/.config
67 printf 'CHMOD ?= $(value CHMOD)'"\n" >> $(@D)/.config 71 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)
81MODS$(1)_$(d) = \ 81MODS$(1)_$(d) = \
82 $$(DESTDIR)$(2)/_openssl.so \ 82 $$(DESTDIR)$(2)/_openssl.so \
83 $$(DESTDIR)$(3)/openssl/bignum.lua \ 83 $$(DESTDIR)$(3)/openssl/bignum.lua \
84 $$(DESTDIR)$(3)/openssl/pkey.lua \
84 $$(DESTDIR)$(3)/openssl/pubkey.lua \ 85 $$(DESTDIR)$(3)/openssl/pubkey.lua \
85 $$(DESTDIR)$(3)/openssl/x509.lua \ 86 $$(DESTDIR)$(3)/openssl/x509.lua \
86 $$(DESTDIR)$(3)/openssl/x509/name.lua \ 87 $$(DESTDIR)$(3)/openssl/x509/name.lua \
@@ -105,6 +106,9 @@ $$(DESTDIR)$(3)/openssl/%.lua: $$(d)/openssl.%.lua
105 $$(MKDIR) -p $$(@D) 106 $$(MKDIR) -p $$(@D)
106 $$(CP) -p $$< $$@ 107 $$(CP) -p $$< $$@
107 108
109$$(DESTDIR)$(3)/openssl/pubkey.lua: $$(DESTDIR)$(3)/openssl/pkey.lua
110 cd $$(@D) && $(LN_S) -f $$(<F) $$(@F)
111
108$$(DESTDIR)$(3)/openssl/x509/%.lua: $$(d)/openssl.x509.%.lua 112$$(DESTDIR)$(3)/openssl/x509/%.lua: $$(d)/openssl.x509.%.lua
109 $$(LUAC$(1)_$(d)) -p $$< 113 $$(LUAC$(1)_$(d)) -p $$<
110 $$(MKDIR) -p $$(@D) 114 $$(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 @@
1local pkey = require"_openssl.pkey"
2
3return pkey
4