diff options
Diffstat (limited to 'archivers/lz4/patches/patch-lib_Makefile')
| -rw-r--r-- | archivers/lz4/patches/patch-lib_Makefile | 55 |
1 files changed, 31 insertions, 24 deletions
diff --git a/archivers/lz4/patches/patch-lib_Makefile b/archivers/lz4/patches/patch-lib_Makefile index 3d38feea674..09ddfd26a7b 100644 --- a/archivers/lz4/patches/patch-lib_Makefile +++ b/archivers/lz4/patches/patch-lib_Makefile @@ -1,8 +1,8 @@ -$NetBSD: patch-lib_Makefile,v 1.3 2016/12/07 21:34:58 fhajny Exp $ +$NetBSD: patch-lib_Makefile,v 1.4 2017/01/04 15:43:51 fhajny Exp $ Make portable. Unlock install target. Use pkgsrc install scripts. ---- lib/Makefile.orig 2016-11-22 20:34:17.000000000 +0000 +--- lib/Makefile.orig 2017-01-03 05:09:52.000000000 +0000 +++ lib/Makefile @@ -31,9 +31,9 @@ # ################################################################ @@ -17,14 +17,19 @@ Make portable. Unlock install target. Use pkgsrc install scripts. LIBVER_SCRIPT:= $(LIBVER_MAJOR_SCRIPT).$(LIBVER_MINOR_SCRIPT).$(LIBVER_PATCH_SCRIPT) LIBVER_MAJOR := $(shell echo $(LIBVER_MAJOR_SCRIPT)) LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT)) -@@ -107,31 +107,27 @@ clean: +@@ -107,11 +107,6 @@ clean: @echo Cleaning library completed --#------------------------------------------------------------------------ --#make install is validated only for Linux, OSX, kFreeBSD, Hurd and --#FreeBSD targets --ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD)) +-#----------------------------------------------------------------------------- +-# make install is validated only for Linux, OSX, BSD, Hurd and Solaris targets +-#----------------------------------------------------------------------------- +-ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS)) +- + ifneq (,$(filter $(shell uname),SunOS)) + INSTALL ?= ginstall + else +@@ -134,26 +129,26 @@ INSTALL_DATA ?= $(INSTALL) -m 644 liblz4.pc: liblz4.pc.in Makefile @echo creating pkgconfig @@ -39,28 +44,30 @@ Make portable. Unlock install target. Use pkgsrc install scripts. $< >$@ install: lib liblz4.pc -- @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ -- @install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) -+ $(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ -+ $(BSD_INSTALL_LIB) -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) - @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR) - @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT) -- @install -m 644 liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ -+ $(BSD_INSTALL_DATA) -m 644 liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/ +- @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ +- @$(INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/ ++ @$(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ $(DESTDIR)$(INCLUDEDIR)/ ++ @$(BSD_INSTALL_DATA) liblz4.pc $(DESTDIR)$(PKGCONFIGDIR)/ + @echo Installing libraries ifeq ($(BUILD_STATIC),yes) -- @install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a -+ $(BSD_INSTALL_DATA) -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a +- @$(INSTALL_LIB) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a ++ @$(BSD_INSTALL_LIB) liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a endif -- @install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h -- @install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h -- @install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h -+ $(BSD_INSTALL_DATA) -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h -+ $(BSD_INSTALL_DATA) -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h -+ $(BSD_INSTALL_DATA) -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h +- @$(INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) ++ @$(BSD_INSTALL_LIB) liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR) + @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_MAJOR) + @ln -sf liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT) + @echo Installing includes +- @$(INSTALL_DATA) lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h +- @$(INSTALL_DATA) lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h +- @$(INSTALL_DATA) lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h ++ @$(BSD_INSTALL_DATA) lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h ++ @$(BSD_INSTALL_DATA) lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h ++ @$(BSD_INSTALL_DATA) lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h @echo lz4 static and shared libraries installed uninstall: -@@ -145,4 +141,3 @@ uninstall: +@@ -167,4 +162,3 @@ uninstall: @$(RM) $(DESTDIR)$(INCLUDEDIR)/lz4frame.h @echo lz4 libraries successfully uninstalled |