From 356f081f0a741b6a7ab24fb779cfb7530fa7286b Mon Sep 17 00:00:00 2001 From: Bernhard Miklautz Date: Fri, 19 Jun 2015 16:23:34 +0200 Subject: [PATCH] Make the static library directory configurable When running "make install" the destination of pkgconfig/openh264.pc and lib/libopenh264.a was hard coded to "lib". When building packages it might be required to change the install location of those files to the systems default library location (like lib64 or lib/x86_64-linux-gnu for example). This commit adds an additional make variable "LIBDIR_NAME" that allows it to change the destination directory for those files. Without setting LIBDIR_NAME the installation location is the same as before (lib). --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e87c8b05..7925d803 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ PREFIX=/usr/local SHARED=-shared OBJ=o DESTDIR= +LIBDIR_NAME=lib SHAREDLIB_DIR=$(PREFIX)/lib PROJECT_NAME=openh264 MODULE_NAME=gmpopenh264 @@ -253,12 +254,12 @@ install-headers: install -m 644 $(SRC_PATH)/codec/api/svc/codec*.h $(DESTDIR)$(PREFIX)/include/wels install-static-lib: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) install-headers - mkdir -p $(DESTDIR)$(PREFIX)/lib - install -m 644 $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/lib + mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME) + install -m 644 $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME) install-static: install-static-lib $(PROJECT_NAME)-static.pc - mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig - install -m 644 $(PROJECT_NAME)-static.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJECT_NAME).pc + mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig + install -m 644 $(PROJECT_NAME)-static.pc $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig/$(PROJECT_NAME).pc install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $(PROJECT_NAME).pc mkdir -p $(DESTDIR)$(SHAREDLIB_DIR) @@ -266,10 +267,10 @@ install-shared: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) install-headers $ if [ "$(SHAREDLIBSUFFIXVER)" != "$(SHAREDLIBSUFFIX)" ]; then \ cp -a $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) $(DESTDIR)$(SHAREDLIB_DIR); \ fi - mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig - install -m 644 $(PROJECT_NAME).pc $(DESTDIR)$(PREFIX)/lib/pkgconfig + mkdir -p $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig + install -m 644 $(PROJECT_NAME).pc $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME)/pkgconfig ifneq ($(EXTRA_LIBRARY),) - install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)$(PREFIX)/lib + install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME) endif install: install-static-lib install-shared