From b1c2a454647d3926ffbc97f7eacc141d2395f668 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Mon, 11 Jun 2012 18:49:40 +0200 Subject: [PATCH] OSX: Change dylib names to be consistent with other platforms. --- Makefile | 7 +++---- src/Makefile | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7ad44595..d0974b8b 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,6 @@ RELVER= 0 PREREL= -beta10 VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) ABIVER= 5.1 -NODOTABIVER= 51 ############################################################################## # @@ -49,9 +48,9 @@ INSTALL_TSYMNAME= luajit INSTALL_ANAME= libluajit-$(ABIVER).a INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) INSTALL_SOSHORT= libluajit-$(ABIVER).so -INSTALL_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib -INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib -INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(MAJVER).dylib +INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib +INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib +INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib INSTALL_PCNAME= luajit.pc INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) diff --git a/src/Makefile b/src/Makefile index c100bd3c..991a02f0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -188,7 +188,7 @@ TARGET_AR= $(CROSS)ar rcus TARGET_STRIP= $(CROSS)strip TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER) -TARGET_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).dylib +TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/lib/$(TARGET_DYLIBNAME) TARGET_DLLNAME= lua$(NODOTABIVER).dll TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME)