Commit 38620986cf8dae6bdb29fd9ba8266a0fcc7636ca
1 parent
3b57b2ec
Exists in
master
and in
3 other branches
Fixing customized builds.
Showing
4 changed files
with
17 additions
and
17 deletions
Show diff stats
src/lib3270++/Makefile.in
| ... | ... | @@ -259,21 +259,21 @@ install-static: \ |
| 259 | 259 | # Install static PKG-CONFIG files |
| 260 | 260 | @mkdir -p $(DESTDIR)$(libdir)/pkgconfig |
| 261 | 261 | @$(INSTALL_DATA) \ |
| 262 | - $(LIBNAME)static.pc \ | |
| 263 | - $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME)static.pc | |
| 262 | + lib3270++static.pc \ | |
| 263 | + $(DESTDIR)$(libdir)/pkgconfig/lib3270++static.pc | |
| 264 | 264 | |
| 265 | 265 | install-dev: |
| 266 | 266 | |
| 267 | 267 | # Install SDK |
| 268 | 268 | @$(INSTALL_DATA) \ |
| 269 | - ../include/$(LIBNAME).h \ | |
| 270 | - $(DESTDIR)$(includedir)/$(LIBNAME).h | |
| 269 | + ../include/lib3270++.h \ | |
| 270 | + $(DESTDIR)$(includedir)/lib3270++.h | |
| 271 | 271 | |
| 272 | 272 | # Install PKG-CONFIG files |
| 273 | 273 | @mkdir -p $(DESTDIR)$(libdir)/pkgconfig |
| 274 | 274 | @$(INSTALL_DATA) \ |
| 275 | - $(LIBNAME).pc \ | |
| 276 | - $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME).pc | |
| 275 | + lib3270++.pc \ | |
| 276 | + $(DESTDIR)$(libdir)/pkgconfig/lib3270++.pc | |
| 277 | 277 | |
| 278 | 278 | |
| 279 | 279 | #---[ Misc Targets ]--------------------------------------------------------------------- | ... | ... |
src/lib3270++/lib3270++static.pc.in
| ... | ... | @@ -10,6 +10,6 @@ sdk_version=@LIB3270_SDK_VERSION@ |
| 10 | 10 | Name: @PACKAGE_NAME@ |
| 11 | 11 | Description: @PACKAGE_DESCRIPTION@ |
| 12 | 12 | Version: @PACKAGE_VERSION@ |
| 13 | -Libs: -L\@libdir@ -l3270++static @LIBSSL_LIBS@ @LIBICONV@ @INTL_LIBS@ | |
| 13 | +Libs: -L\@libdir@ -l@LIB3270_NAME@++static @LIBSSL_LIBS@ @LIBICONV@ @INTL_LIBS@ | |
| 14 | 14 | Cflags: -I@includedir@ |
| 15 | 15 | ... | ... |
src/lib3270/Makefile.in
| ... | ... | @@ -255,27 +255,27 @@ install-static: \ |
| 255 | 255 | # Install static PKG-CONFIG files |
| 256 | 256 | @mkdir -p $(DESTDIR)$(libdir)/pkgconfig |
| 257 | 257 | @$(INSTALL_DATA) \ |
| 258 | - $(LIBNAME)-static.pc \ | |
| 259 | - $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME)-static.pc | |
| 258 | + lib3270-static.pc \ | |
| 259 | + $(DESTDIR)$(libdir)/pkgconfig/lib3270-static.pc | |
| 260 | 260 | |
| 261 | 261 | install-dev: |
| 262 | 262 | |
| 263 | 263 | # Install SDK |
| 264 | - @mkdir -p $(DESTDIR)$(includedir)/$(LIBNAME) | |
| 264 | + @mkdir -p $(DESTDIR)$(includedir)/lib3270 | |
| 265 | 265 | |
| 266 | 266 | @$(INSTALL_DATA) \ |
| 267 | - ../include/$(LIBNAME)/*.h \ | |
| 268 | - $(DESTDIR)$(includedir)/$(LIBNAME) | |
| 267 | + ../include/lib3270/*.h \ | |
| 268 | + $(DESTDIR)$(includedir)/lib3270 | |
| 269 | 269 | |
| 270 | 270 | @$(INSTALL_DATA) \ |
| 271 | - ../include/$(LIBNAME).h \ | |
| 272 | - $(DESTDIR)$(includedir)/$(LIBNAME).h | |
| 271 | + ../include/lib3270.h \ | |
| 272 | + $(DESTDIR)$(includedir)/lib3270.h | |
| 273 | 273 | |
| 274 | 274 | # Install PKG-CONFIG files |
| 275 | 275 | @mkdir -p $(DESTDIR)$(libdir)/pkgconfig |
| 276 | 276 | @$(INSTALL_DATA) \ |
| 277 | - $(LIBNAME).pc \ | |
| 278 | - $(DESTDIR)$(libdir)/pkgconfig/$(LIBNAME).pc | |
| 277 | + lib3270.pc \ | |
| 278 | + $(DESTDIR)$(libdir)/pkgconfig/lib3270.pc | |
| 279 | 279 | |
| 280 | 280 | |
| 281 | 281 | #---[ Misc Targets ]--------------------------------------------------------------------- | ... | ... |
src/lib3270/lib3270-static.pc.in
| ... | ... | @@ -7,7 +7,7 @@ version_major=@PACKAGE_MAJOR_VERSION@ |
| 7 | 7 | version_minor=@PACKAGE_MINOR_VERSION@ |
| 8 | 8 | sdk_version=@LIB3270_SDK_VERSION@ |
| 9 | 9 | |
| 10 | -Name: @PACKAGE_NAME@ | |
| 10 | +Name: @PACKAGE_NAME@-static | |
| 11 | 11 | Description: @PACKAGE_DESCRIPTION@ (static library) |
| 12 | 12 | Version: @PACKAGE_VERSION@ |
| 13 | 13 | Libs: -L\@libdir@ -l@LIB3270_NAME@-static @LIBSSL_LIBS@ @INTL_LIBS@ | ... | ... |