diff options
| author | Mike Pall <mike> | 2012-06-11 18:49:40 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2012-06-11 18:49:40 +0200 |
| commit | b1c2a454647d3926ffbc97f7eacc141d2395f668 (patch) | |
| tree | 4a4f88c061f328dd28baf719de6a3f0da3b869db | |
| parent | b51d7fb31059bb845be8691d4affbd1a910bfb84 (diff) | |
| download | luajit-b1c2a454647d3926ffbc97f7eacc141d2395f668.tar.gz luajit-b1c2a454647d3926ffbc97f7eacc141d2395f668.tar.bz2 luajit-b1c2a454647d3926ffbc97f7eacc141d2395f668.zip | |
OSX: Change dylib names to be consistent with other platforms.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | src/Makefile | 2 |
2 files changed, 4 insertions, 5 deletions
| @@ -19,7 +19,6 @@ RELVER= 0 | |||
| 19 | PREREL= -beta10 | 19 | PREREL= -beta10 |
| 20 | VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) | 20 | VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) |
| 21 | ABIVER= 5.1 | 21 | ABIVER= 5.1 |
| 22 | NODOTABIVER= 51 | ||
| 23 | 22 | ||
| 24 | ############################################################################## | 23 | ############################################################################## |
| 25 | # | 24 | # |
| @@ -49,9 +48,9 @@ INSTALL_TSYMNAME= luajit | |||
| 49 | INSTALL_ANAME= libluajit-$(ABIVER).a | 48 | INSTALL_ANAME= libluajit-$(ABIVER).a |
| 50 | INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) | 49 | INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) |
| 51 | INSTALL_SOSHORT= libluajit-$(ABIVER).so | 50 | INSTALL_SOSHORT= libluajit-$(ABIVER).so |
| 52 | INSTALL_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib | 51 | INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib |
| 53 | INSTALL_DYLIBSHORT1= libluajit-$(NODOTABIVER).dylib | 52 | INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib |
| 54 | INSTALL_DYLIBSHORT2= libluajit-$(NODOTABIVER).$(MAJVER).dylib | 53 | INSTALL_DYLIBSHORT2= libluajit-$(ABIVER).$(MAJVER).dylib |
| 55 | INSTALL_PCNAME= luajit.pc | 54 | INSTALL_PCNAME= luajit.pc |
| 56 | 55 | ||
| 57 | INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) | 56 | 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 | |||
| 188 | TARGET_STRIP= $(CROSS)strip | 188 | TARGET_STRIP= $(CROSS)strip |
| 189 | 189 | ||
| 190 | TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER) | 190 | TARGET_SONAME= libluajit-$(ABIVER).so.$(MAJVER) |
| 191 | TARGET_DYLIBNAME= libluajit-$(NODOTABIVER).$(MAJVER).dylib | 191 | TARGET_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).dylib |
| 192 | TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/lib/$(TARGET_DYLIBNAME) | 192 | TARGET_DYLIBPATH= $(or $(PREFIX),/usr/local)/lib/$(TARGET_DYLIBNAME) |
| 193 | TARGET_DLLNAME= lua$(NODOTABIVER).dll | 193 | TARGET_DLLNAME= lua$(NODOTABIVER).dll |
| 194 | TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME) | 194 | TARGET_XSHLDFLAGS= -shared -fPIC -Wl,-soname,$(TARGET_SONAME) |
