From 0d15a6b2f111503ff43af814a8277737e5846885 Mon Sep 17 00:00:00 2001 From: dmiller Date: Sat, 29 Jul 2017 19:15:47 +0000 Subject: [PATCH] Avoid installing libssh2 libs into DESTDIR as part of make install --- Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index b2f359037..dd630a2dc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -141,7 +141,7 @@ build-pcap: $(LIBPCAPDIR)/Makefile build-libssh2: $(LIBSSH2DIR)/src/Makefile @echo Compiling libssh2; cd $(LIBSSH2DIR)/src && $(MAKE); - cd $(LIBSSH2DIR)/src && $(MAKE) prefix=$(NDIR)/$(LIBSSH2DIR) install-libLTLIBRARIES; + cd $(LIBSSH2DIR)/src && $(MAKE) prefix="" DESTDIR=$(NDIR)/$(LIBSSH2DIR) install-libLTLIBRARIES; build-zlib: $(ZLIBDIR)/Makefile @echo Compiling zlib; cd $(ZLIBDIR) && $(MAKE); @@ -220,8 +220,8 @@ clean-pcap: -cd $(LIBPCAPDIR) && $(MAKE) clean clean-libssh2: - -cd $(LIBSSH2DIR)/src && $(MAKE) prefix=$(NDIR)/$(LIBSSH2DIR) uninstall-libLTLIBRARIES - -cd $(LIBSSH2DIR)/src && $(MAKE) prefix=$(NDIR)/$(LIBSSH2DIR) clean + -cd $(LIBSSH2DIR)/src && $(MAKE) prefix="" DESTDIR=$(NDIR)/$(LIBSSH2DIR) uninstall-libLTLIBRARIES + -cd $(LIBSSH2DIR)/src && $(MAKE) prefix="" DESTDIR=$(NDIR)/$(LIBSSH2DIR) clean -cd $(LIBSSH2DIR) && $(MAKE) clean clean-zlib: @@ -270,7 +270,7 @@ distclean-pcap: -cd $(LIBPCAPDIR) && $(MAKE) distclean distclean-libssh2: - -cd $(LIBSSH2DIR)/src && $(MAKE) prefix=$(NDIR)/$(LIBSSH2DIR) distclean + -cd $(LIBSSH2DIR)/src && $(MAKE) prefix="" DESTDIR=$(NDIR)/$(LIBSSH2DIR) distclean -cd $(LIBSSH2DIR) && $(MAKE) distclean distclean-zlib: