diff --git a/Makefile.in b/Makefile.in index a46ce0f..b85e7f7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,6 +27,7 @@ #---[ Library configuration ]------------------------------------------------------------ LIBNAME=lib@LIB3270_NAME@ +INSTALL_PACKAGES=@INSTALL_PACKAGES@ SOURCES= \ $(wildcard src/core/*.c) \ @@ -227,9 +228,7 @@ $(BINRLS)/static/$(LIBNAME).a: \ #---[ Install Targets ]------------------------------------------------------------------ install: \ - install-shared \ - install-static \ - install-dev + $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG)) install-shared: \ $(BINRLS)/$(LIBNAME)@DLLEXT@ @@ -261,6 +260,11 @@ install-static: \ $(BINRLS)/static/$(LIBNAME).a \ $(DESTDIR)$(libdir)/$(LIBNAME)-static.a + @mkdir -p $(DESTDIR)$(libdir)/pkgconfig + @$(INSTALL_DATA) \ + sdk/lib3270-static.pc \ + $(DESTDIR)$(libdir)/pkgconfig/lib3270-static.pc + install-dev: \ $(POTDIR)/$(LIBNAME).pot @@ -277,7 +281,7 @@ install-dev: \ # Install PKG-CONFIG files @mkdir -p $(DESTDIR)$(libdir)/pkgconfig @$(INSTALL_DATA) \ - lib3270.pc \ + sdk/lib3270.pc \ $(DESTDIR)$(libdir)/pkgconfig/lib3270.pc # Install translation files @@ -418,7 +422,6 @@ clean: \ @rm -fr $(BASEDIR)/.tmp/$(LIBNAME) @rm -fr $(POTDIR)/$(LIBNAME) - @rm -fr src/include/marshal cleanDebug: diff --git a/configure.ac b/configure.ac index d6f8aed..2051f3a 100644 --- a/configure.ac +++ b/configure.ac @@ -583,8 +583,8 @@ AC_SUBST(INSTALL_PACKAGES) AC_CONFIG_FILES(Makefile) -AC_CONFIG_FILES(src/core/lib3270.pc) -AC_CONFIG_FILES(src/core/lib3270-static.pc) +AC_CONFIG_FILES(sdk/lib3270.pc) +AC_CONFIG_FILES(sdk/lib3270-static.pc) dnl --------------------------------------------------------------------------- dnl Output the generated config.status script. diff --git a/sdk/lib3270-static.pc.in b/sdk/lib3270-static.pc.in new file mode 100644 index 0000000..95c8f84 --- /dev/null +++ b/sdk/lib3270-static.pc.in @@ -0,0 +1,15 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +version_major=@PACKAGE_MAJOR_VERSION@ +version_minor=@PACKAGE_MINOR_VERSION@ +sdk_version=@LIB3270_SDK_VERSION@ + +Name: @PACKAGE_NAME@-static +Description: @PACKAGE_DESCRIPTION@ (static library) +Version: @PACKAGE_VERSION@ +Libs: -L\@libdir@ -l@LIB3270_NAME@-static @LIBSSL_LIBS@ @INTL_LIBS@ +Cflags: -I@includedir@ + diff --git a/sdk/lib3270.pc.in b/sdk/lib3270.pc.in new file mode 100644 index 0000000..0c1d8ed --- /dev/null +++ b/sdk/lib3270.pc.in @@ -0,0 +1,17 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +version_major=@PACKAGE_MAJOR_VERSION@ +version_minor=@PACKAGE_MINOR_VERSION@ +sdk_version=@LIB3270_SDK_VERSION@ +library_name=@LIB3270_NAME@ + +Name: @PACKAGE_NAME@ +Description: @PACKAGE_DESCRIPTION@ +Version: @PACKAGE_VERSION@ +Libs: -L\@libdir@ -l@LIB3270_NAME@ +Libs.private: @LIBSSL_LIBS@ @INTL_LIBS@ +Cflags: -I@includedir@ + diff --git a/src/core/lib3270-static.pc.in b/src/core/lib3270-static.pc.in deleted file mode 100644 index 95c8f84..0000000 --- a/src/core/lib3270-static.pc.in +++ /dev/null @@ -1,15 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -version_major=@PACKAGE_MAJOR_VERSION@ -version_minor=@PACKAGE_MINOR_VERSION@ -sdk_version=@LIB3270_SDK_VERSION@ - -Name: @PACKAGE_NAME@-static -Description: @PACKAGE_DESCRIPTION@ (static library) -Version: @PACKAGE_VERSION@ -Libs: -L\@libdir@ -l@LIB3270_NAME@-static @LIBSSL_LIBS@ @INTL_LIBS@ -Cflags: -I@includedir@ - diff --git a/src/core/lib3270.pc.in b/src/core/lib3270.pc.in deleted file mode 100644 index 0c1d8ed..0000000 --- a/src/core/lib3270.pc.in +++ /dev/null @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -version_major=@PACKAGE_MAJOR_VERSION@ -version_minor=@PACKAGE_MINOR_VERSION@ -sdk_version=@LIB3270_SDK_VERSION@ -library_name=@LIB3270_NAME@ - -Name: @PACKAGE_NAME@ -Description: @PACKAGE_DESCRIPTION@ -Version: @PACKAGE_VERSION@ -Libs: -L\@libdir@ -l@LIB3270_NAME@ -Libs.private: @LIBSSL_LIBS@ @INTL_LIBS@ -Cflags: -I@includedir@ - -- libgit2 0.21.2