diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-03-26 00:32:27 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-03-26 00:32:27 +0100 |
| commit | d86ce9c7a44118082612c3cfb3a866b9f8f6098f (patch) | |
| tree | 8b9664a78aa7c7a817aa15957d95e0ceb3927eda | |
| parent | fcb2cb5e00c19c7ed0fab137db97faee69c4e147 (diff) | |
| download | nx-libs-d86ce9c7a44118082612c3cfb3a866b9f8f6098f.tar.gz nx-libs-d86ce9c7a44118082612c3cfb3a866b9f8f6098f.tar.bz2 nx-libs-d86ce9c7a44118082612c3cfb3a866b9f8f6098f.zip | |
nxcomp{,ext,shad}: only use the first three numbers in the full version for current_version on OS X. ld(1) on 10.6 fails otherwise.
| -rw-r--r-- | nxcomp/Makefile.in | 3 | ||||
| -rw-r--r-- | nxcompext/Makefile.in | 3 | ||||
| -rw-r--r-- | nxcompshad/Makefile.in | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/nxcomp/Makefile.in b/nxcomp/Makefile.in index e571b3c90..6022747cb 100644 --- a/nxcomp/Makefile.in +++ b/nxcomp/Makefile.in @@ -95,7 +95,8 @@ ifeq ($(shell uname),Darwin) LIBFULL = lib$(LIBRARY).$(VERSION).dylib LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib LIBSHARED = lib$(LIBRARY).dylib -LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION) +COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3) +LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER) else LIBFULL = lib$(LIBRARY).so.$(VERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) diff --git a/nxcompext/Makefile.in b/nxcompext/Makefile.in index da464bd6d..b33c5aaf3 100644 --- a/nxcompext/Makefile.in +++ b/nxcompext/Makefile.in @@ -86,7 +86,8 @@ ifeq ($(shell uname),Darwin) LIBFULL = lib$(LIBRARY).$(VERSION).dylib LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib LIBSHARED = lib$(LIBRARY).dylib -LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION) +COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3) +LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER) else LIBFULL = lib$(LIBRARY).so.$(VERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) diff --git a/nxcompshad/Makefile.in b/nxcompshad/Makefile.in index 5ea286395..41d644f5e 100644 --- a/nxcompshad/Makefile.in +++ b/nxcompshad/Makefile.in @@ -107,7 +107,8 @@ ifeq ($(shell uname),Darwin) LIBFULL = lib$(LIBRARY).$(VERSION).dylib LIBLOAD = lib$(LIBRARY).$(LIBVERSION).dylib LIBSHARED = lib$(LIBRARY).dylib -LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(VERSION) +COMP_VER = $(shell echo '$(VERSION)' | cut -d '.' -f 1-3) +LIBFLAGS = -install_name $(libdir)/$(LIBLOAD) -compatibility_version $(LIBVERSION) -current_version $(COMP_VER) else LIBFULL = lib$(LIBRARY).so.$(VERSION) LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION) |