From 39c7b224a1ad48db7a05a8f58c336c602df32f19 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 7 Dec 2018 18:05:14 -0200 Subject: [PATCH] Fixing win32 builds. --- Makefile.in | 14 +++++++++++++- src/lib3270++/Makefile.in | 3 ++- src/lib3270/Makefile.in | 5 +++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0473c98..f710f8e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -144,8 +144,20 @@ doc: #---[ Install Targets ]------------------------------------------------------------------ -install: +install: \ + install-shared \ + install-static \ + install-dev +install-shared: + $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270 $@ + $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270++ $@ + +install-static: + $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270 $@ + $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270++ $@ + +install-dev: $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270 $@ $(MAKE) DESTDIR=$(DESTDIR) -C src/lib3270++ $@ diff --git a/src/lib3270++/Makefile.in b/src/lib3270++/Makefile.in index 5e059e1..046c23c 100644 --- a/src/lib3270++/Makefile.in +++ b/src/lib3270++/Makefile.in @@ -248,9 +248,10 @@ install-static: \ $(BINRLS)/static/$(LIBNAME).a # Install static library + @mkdir -p $(DESTDIR)$(libdir) @$(INSTALL_DATA) \ $(BINRLS)/static/$(LIBNAME).a \ - $(DESTDIR)$(libdir) + $(DESTDIR)$(libdir)/$(LIBNAME)static.a install-dev: diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index e9376d2..88170ed 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -243,9 +243,10 @@ install-static: \ $(BINRLS)/static/$(LIBNAME).a # Install static library - @$(INSTALL_DATA) \ + mkdir -p $(DESTDIR)$(libdir) + $(INSTALL_DATA) \ $(BINRLS)/static/$(LIBNAME).a \ - $(DESTDIR)$(libdir) + $(DESTDIR)$(libdir)/$(LIBNAME)-static.a install-dev: -- libgit2 0.21.2