From 1ebb79d5d6d7f1dc6070c5016f6914adf38cb852 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Wed, 9 Apr 2008 11:20:01 +0000
Subject: [PATCH] make: Add LD_CONF support (automatically added to all
 projects in lib.mk)

---
 make/defs-dev.mk  |  7 +++++++
 make/defs-dist.mk |  7 +++++++
 make/defs.mk      |  5 +++++
 make/lib.mk       | 13 ++++++++++---
 make/rules.mk     |  2 +-
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index c36a6969..b945f138 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -12,6 +12,7 @@ EXE_PREFIX       ?= $(PREFIX)
 INIT_PREFIX      ?= $(EXE_PREFIX)
 SYSCONFIG_PREFIX ?= $(PREFIX)/sysconfig
 CONFIG_DIR       ?= $(ENV_PREFIX)/$(HOME)/etc/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
+LD_CONF_DIR      ?= $(ENV_PREFIX)/$(HOME)/etc/ld.so.conf.d
 IMG_PREFIX       ?= $(PREFIX)
 LOG_PREFIX       ?= $(PREFIX)/log
 JAVA_PREFIX      ?= $(PREFIX)
@@ -135,6 +136,12 @@ JAVAMODE         ?= $(LIBMODE)
 JAVADIROWNER     ?= $(LIBDIROWNER)
 JAVADIRGROUP     ?= $(LIBDIRGROUP)
 JAVADIRMODE      ?= $(LIBDIRMODE)
+LD_CONFOWNER     ?= $(CFGOWNER)
+LD_CONFGROUP     ?= $(CFGGROUP)
+LD_CONFMODE      ?= $(CFGMODE)
+LD_CONFDIROWNER  ?= $(CFGDIROWNER)
+LD_CONFDIRGROUP  ?= $(CFGDIROWNER)
+LD_CONFDIRMODE   ?= $(CFGDIRMODE)
 
 # -- options
 
diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index 5bd1d613..663fd3e2 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -12,6 +12,7 @@ EXE_PREFIX       ?= $(PREFIX)
 INIT_PREFIX      ?= $(ENV_PREFIX)/etc$(FLAVOUR_PATH_SUFFIX)
 SYSCONFIG_PREFIX ?= $(ENV_PREFIX)/etc/$(FLAVOUR_PATH_PREFIX)sysconfig
 CONFIG_DIR       ?= $(ENV_PREFIX)/etc/opt/$(FLAVOUR_PATH_PREFIX)$(PROJECT)
+LD_CONF_DIR      ?= $(ENV_PREFIX)/etc/ld.so.conf.d
 IMG_PREFIX       ?= $(PREFIX)
 LOG_PREFIX       ?= $(ENV_PREFIX)/var/log
 JAVA_PREFIX      ?= $(PREFIX)
@@ -136,6 +137,12 @@ JAVAMODE         ?= $(LIBMODE)
 JAVADIROWNER     ?= $(LIBDIROWNER)
 JAVADIRGROUP     ?= $(LIBDIRGROUP)
 JAVADIRMODE      ?= $(LIBDIRMODE)
+LD_CONFOWNER     ?= $(CFGOWNER)
+LD_CONFGROUP     ?= $(CFGGROUP)
+LD_CONFMODE      ?= $(CFGMODE)
+LD_CONFDIROWNER  ?= $(CFGDIROWNER)
+LD_CONFDIRGROUP  ?= $(CFGDIROWNER)
+LD_CONFDIRMODE   ?= $(CFGDIRMODE)
 
 # -- options
 
diff --git a/make/defs.mk b/make/defs.mk
index 63b785eb..c281f659 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -322,6 +322,11 @@ JAVA_JARS              ?= $(wildcard *.jar)
 INSTALL_JAVADIR        ?= $(JAVADIR)
 INSTALLED_JAVA         ?= $(addprefix $(INSTALL_JAVADIR)/,$(JAVA_JARS))
 
+# -- LD_CONF
+LD_CONF            += ld-$(PROJECT).conf
+INSTALL_LD_CONFDIR  = $(LD_CONF_DIR)
+INSTALLED_LD_CONF   = $(addprefix $(INSTALL_LD_CONFDIR)/,$(LD_CONF))
+
 # ==
 
 ifeq ($(DEVELOPMENT),true)
diff --git a/make/lib.mk b/make/lib.mk
index c9c2d359..672e8ed6 100644
--- a/make/lib.mk
+++ b/make/lib.mk
@@ -6,9 +6,9 @@
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
 
-all: $(LIB_SO) $(LINKS_SO) $(MSVCPP_IMPLIB) $(STRIP_DONE)
-install: install_LIB
-clean: libclean local_libclean
+all: $(LD_CONF) $(LIB_SO) $(LINKS_SO) $(MSVCPP_IMPLIB) $(STRIP_DONE)
+install: install_LIB $(INSTALLED_LD_CONF)
+clean: libclean local_libclean clean.ld-conf
 distclean: clean
 
 local_libclean: clean.mingw clean.unix clean.all
@@ -25,3 +25,10 @@ endif
 
 clean.all:
 	rm -rf *.a *.o *~ st* .*.swp *.done
+
+ld-%.conf:
+	echo $(INSTALL_LIBDIR) > $@.tmp
+	mv $@.tmp $@
+
+clean.ld-conf:
+	rm -f $(LD_CONF)
diff --git a/make/rules.mk b/make/rules.mk
index 0ba3a719..b9175375 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -248,7 +248,7 @@ check_not_empty_$(1):
 	fi
 endef
 
-INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG IMG LOG JAVA
+INSTALLATION_FILE_TYPES = LIB PI HDR EXE SCRIPT INIT DOC PROFILE MAKE CFG IMG LOG JAVA LD_CONF
 
 #$(foreach attr,OWNER GROUP MODE,$(foreach type, $(INSTALLATION_FILE_TYPES),\
 #	$(eval $(call std_install_rules,$(type)$(attr)))))