aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-10-19 15:40:36 +0200
committerMicael Karlberg <[email protected]>2011-10-19 15:40:36 +0200
commit39c80cd3049a2381dfbe0b86c6578ca12309c104 (patch)
treedb0bd2aaef53c7070a1587ddf9dbf10a1792575c /lib/asn1
parentc8515be586ee98aca2de19d2b1b0d2d5ca1174af (diff)
parent02ec67177b2f5d2de371362e5bb3c9b9771fb0b8 (diff)
downloadotp-39c80cd3049a2381dfbe0b86c6578ca12309c104.tar.gz
otp-39c80cd3049a2381dfbe0b86c6578ca12309c104.tar.bz2
otp-39c80cd3049a2381dfbe0b86c6578ca12309c104.zip
Merge branch 'master' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'lib/asn1')
-rw-r--r--lib/asn1/c_src/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
index f7213b9651..8c06be56f8 100644
--- a/lib/asn1/c_src/Makefile
+++ b/lib/asn1/c_src/Makefile
@@ -62,7 +62,7 @@ NIF_OBJ_FILES = $(OBJDIR)/asn1_erl_nif.o
ifeq ($(TARGET),win32)
-NIF_SHARED_OBJ_FILES = $(LIBDIR)/asn1_erl_nif.dll
+NIF_SHARED_OBJ_FILE = $(LIBDIR)/asn1_erl_nif.dll
CLIB_FLAGS =
LN=cp
else