diff options
| author |   william <william@25thandclement.com>
| 2015-03-04 18:42:28 -0800 |
|---|---|---|
| committer | william <william@25thandclement.com>
| 2015-03-04 18:42:28 -0800 |
| commit | 040bfbcb57ef45f039c8ecff6a47277d33c295f3 (patch) | |
| tree | faee3f0a21bcce6442bdeaf5ab44b96a00ff596b /src | |
| parent | 7c5ce4211db9e61d140612d22d6584dc17d180a6 (diff) | |
| download | luaossl-040bfbcb57ef45f039c8ecff6a47277d33c295f3.tar.gz luaossl-040bfbcb57ef45f039c8ecff6a47277d33c295f3.tar.bz2 luaossl-040bfbcb57ef45f039c8ecff6a47277d33c295f3.zip | |
readd pubkey.lua as a stub because the previous solution of using a symbolic link was causing packaging headaches
Diffstat (limited to 'src')
| -rw-r--r-- | src/GNUmakefile | 11 | ||||
| -rw-r--r-- | src/openssl.pubkey.lua | 2 |
2 files changed, 11 insertions, 2 deletions
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" |