revert install to normal zstd due to travis limitation (likely gcc 4.6)

diff --git a/Makefile b/Makefile
index 4ec4a795400f774ddddfaa00189d4a9a963b46cd..fbdb05c91f12c3e9dd5d99fb1db309e8ec55c1c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -74,7 +74,7 @@ uninstall:
        $(MAKE) -C $(PRGDIR) $@
 
 travis-install:
-       sudo $(MAKE) install
+       $(MAKE) install PREFIX=~/install_test_dir
 
 test:
        $(MAKE) -C $(PRGDIR) $@

diff --git a/lib/Makefile b/lib/Makefile
index caf70035650ebc2fa5a94931c800bf69d9baa052..c621f63c84207546dd872523911dfa03f5be6ce9 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -65,9 +65,9 @@ ifeq ($(shell uname), Darwin)
        SHARED_EXT = dylib
        SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT)
        SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
-       SONAME_FLAGS = -install_name $(PREFIX)/lib/libzstd.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
+       SONAME_FLAGS = -install_name $(PREFIX)/lib/$@.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
 else
-       SONAME_FLAGS = -Wl,-soname=libzstd.$(SHARED_EXT).$(LIBVER_MAJOR)
+       SONAME_FLAGS = -Wl,-soname=$@.$(SHARED_EXT).$(LIBVER_MAJOR)
        SHARED_EXT = so
        SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
        SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
@@ -83,7 +83,7 @@ all: clean libzstd
 libzstd: $(ZSTD_FILES)
        @echo compiling static library
        @$(CC) $(FLAGS) -c $^
-       @$(AR) rcs libzstd.a *.o
+       @$(AR) rcs $@.a *.o
        @echo compiling dynamic library $(LIBVER)
        @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
        @echo creating versioned links
@@ -91,10 +91,9 @@ libzstd: $(ZSTD_FILES)
        @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
 
 clean:
-       @rm -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
+       @rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
        @echo Cleaning library completed
 
-
 #------------------------------------------------------------------------
 #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))

diff --git a/programs/Makefile b/programs/Makefile
index 6568851bc94fe206c2927ef7d797477a2c829d89..c6a58939ca0f32de1cde1d4a6ba42be7f57ae7f8 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -133,7 +133,7 @@ clean:
 #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
 
-install: zstd-pgo
+install: zstd
        @echo Installing binaries
        @install -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/
        @install -m 755 zstd$(EXT) $(DESTDIR)$(BINDIR)/zstd$(EXT)