From 38620986cf8dae6bdb29fd9ba8266a0fcc7636ca Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 15 Jan 2019 16:54:22 -0200 Subject: [PATCH] Fixing customized builds. --- src/lib3270++/Makefile.in | 12 ++++++------ src/lib3270++/lib3270++static.pc.in | 2 +- src/lib3270/Makefile.in | 18 +++++++++--------- src/lib3270/lib3270-static.pc.in | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/lib3270++/Makefile.in b/src/lib3270++/Makefile.in index e8e6185..a82ba2d 100644 --- a/src/lib3270++/Makefile.in +++ b/src/lib3270++/Makefile.in @@ -259,21 +259,21 @@ install-static: \ # Install static PKG-CONFIG files @mkdir -p $(DESTDIR)$(libdir)/pkgconfig @$(INSTALL_DATA) \ - $(LIBNAME)static.pc \ - $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME)static.pc + lib3270++static.pc \ + $(DESTDIR)$(libdir)/pkgconfig/lib3270++static.pc install-dev: # Install SDK @$(INSTALL_DATA) \ - ../include/$(LIBNAME).h \ - $(DESTDIR)$(includedir)/$(LIBNAME).h + ../include/lib3270++.h \ + $(DESTDIR)$(includedir)/lib3270++.h # Install PKG-CONFIG files @mkdir -p $(DESTDIR)$(libdir)/pkgconfig @$(INSTALL_DATA) \ - $(LIBNAME).pc \ - $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME).pc + lib3270++.pc \ + $(DESTDIR)$(libdir)/pkgconfig/lib3270++.pc #---[ Misc Targets ]--------------------------------------------------------------------- diff --git a/src/lib3270++/lib3270++static.pc.in b/src/lib3270++/lib3270++static.pc.in index ede3a5d..245f92a 100644 --- a/src/lib3270++/lib3270++static.pc.in +++ b/src/lib3270++/lib3270++static.pc.in @@ -10,6 +10,6 @@ sdk_version=@LIB3270_SDK_VERSION@ Name: @PACKAGE_NAME@ Description: @PACKAGE_DESCRIPTION@ Version: @PACKAGE_VERSION@ -Libs: -L\@libdir@ -l3270++static @LIBSSL_LIBS@ @LIBICONV@ @INTL_LIBS@ +Libs: -L\@libdir@ -l@LIB3270_NAME@++static @LIBSSL_LIBS@ @LIBICONV@ @INTL_LIBS@ Cflags: -I@includedir@ diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index 8142da1..4fa04c1 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -255,27 +255,27 @@ install-static: \ # Install static PKG-CONFIG files @mkdir -p $(DESTDIR)$(libdir)/pkgconfig @$(INSTALL_DATA) \ - $(LIBNAME)-static.pc \ - $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME)-static.pc + lib3270-static.pc \ + $(DESTDIR)$(libdir)/pkgconfig/lib3270-static.pc install-dev: # Install SDK - @mkdir -p $(DESTDIR)$(includedir)/$(LIBNAME) + @mkdir -p $(DESTDIR)$(includedir)/lib3270 @$(INSTALL_DATA) \ - ../include/$(LIBNAME)/*.h \ - $(DESTDIR)$(includedir)/$(LIBNAME) + ../include/lib3270/*.h \ + $(DESTDIR)$(includedir)/lib3270 @$(INSTALL_DATA) \ - ../include/$(LIBNAME).h \ - $(DESTDIR)$(includedir)/$(LIBNAME).h + ../include/lib3270.h \ + $(DESTDIR)$(includedir)/lib3270.h # Install PKG-CONFIG files @mkdir -p $(DESTDIR)$(libdir)/pkgconfig @$(INSTALL_DATA) \ - $(LIBNAME).pc \ - $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME).pc + lib3270.pc \ + $(DESTDIR)$(libdir)/pkgconfig/lib3270.pc #---[ Misc Targets ]--------------------------------------------------------------------- diff --git a/src/lib3270/lib3270-static.pc.in b/src/lib3270/lib3270-static.pc.in index 883c1f2..95c8f84 100644 --- a/src/lib3270/lib3270-static.pc.in +++ b/src/lib3270/lib3270-static.pc.in @@ -7,7 +7,7 @@ version_major=@PACKAGE_MAJOR_VERSION@ version_minor=@PACKAGE_MINOR_VERSION@ sdk_version=@LIB3270_SDK_VERSION@ -Name: @PACKAGE_NAME@ +Name: @PACKAGE_NAME@-static Description: @PACKAGE_DESCRIPTION@ (static library) Version: @PACKAGE_VERSION@ Libs: -L\@libdir@ -l@LIB3270_NAME@-static @LIBSSL_LIBS@ @INTL_LIBS@ -- libgit2 0.21.2