From 2fde722340ae3a1cdca69c5bbb21588cd6ee6bdf Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 16 Jan 2010 13:47:33 +0000 Subject: [PATCH] openldap: add slapd.conf to the package and mark it as config file SVN-Revision: 19168 --- libs/openldap/Makefile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index c219ff260..17f62dd75 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openldap PKG_VERSION:=2.4.19 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ @@ -73,6 +73,10 @@ define Package/openldap-server/description This package contains server programs required to provide LDAP services. endef +define Package/openldap-server/conffiles +/etc/openldap/slapd.conf +endef + TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ @@ -106,16 +110,16 @@ endef define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(1)/usr/include/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(1)/usr/lib/ endef define Package/libopenldap/install $(INSTALL_DIR) $(1)/etc/openldap - $(CP) $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(1)/etc/openldap/ + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(1)/etc/openldap/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(1)/usr/lib/ endef define Package/openldap-utils/install @@ -127,7 +131,8 @@ define Package/openldap-server/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/ldap.init $(1)/etc/init.d/ldap $(INSTALL_DIR) $(1)/etc/openldap/schema - $(CP) $(PKG_INSTALL_DIR)/etc/openldap/schema/* $(1)/etc/openldap/schema/ + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/schema/* $(1)/etc/openldap/schema/ + $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/slapd.conf $(1)/etc/openldap/ $(INSTALL_DIR) $(1)/usr/sbin # OpenLDAP installs slapd into libexecdir, not sbindir: $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/slapd $(1)/usr/sbin/ -- 2.30.2