From a6c87aa190c47c2e6f1553a4a2f7ef30e350d48b Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 29 Aug 2004 20:11:08 +0000 Subject: [PATCH] added FHS install hack to sope-ldap git-svn-id: http://svn.opengroupware.org/SOPE/trunk@85 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-ldap/NGLdap/ChangeLog | 7 +++++++ sope-ldap/NGLdap/GNUmakefile | 28 +++++++++++++--------------- sope-ldap/NGLdap/Version | 4 ++-- sope-ldap/NGLdap/fhs.make | 30 ++++++++++++++++++++++++++++++ sope-ldap/samples/ChangeLog | 6 ++++++ sope-ldap/samples/GNUmakefile | 3 ++- sope-ldap/samples/fhs.make | 26 ++++++++++++++++++++++++++ 7 files changed, 86 insertions(+), 18 deletions(-) create mode 100644 sope-ldap/NGLdap/fhs.make create mode 100644 sope-ldap/samples/fhs.make diff --git a/sope-ldap/NGLdap/ChangeLog b/sope-ldap/NGLdap/ChangeLog index 47d36465..5a5c13ec 100644 --- a/sope-ldap/NGLdap/ChangeLog +++ b/sope-ldap/NGLdap/ChangeLog @@ -1,3 +1,10 @@ +2004-08-29 Helge Hess + + * added hack to install the project in FHS locations - the library, + its headers, the tools and the resources will be installed in + FHS_INSTALL_ROOT if specified (eg make FHS_INSTALL_ROOT=/usr/local) + (v4.3.20) + 2004-08-29 Marcus Mueller * NGLdap.xcode: new Xcode project diff --git a/sope-ldap/NGLdap/GNUmakefile b/sope-ldap/NGLdap/GNUmakefile index f7f9586c..6fef2387 100644 --- a/sope-ldap/NGLdap/GNUmakefile +++ b/sope-ldap/NGLdap/GNUmakefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: GNUmakefile 32 2004-08-21 00:50:30Z helge $ include $(GNUSTEP_MAKEFILES)/common.make include ./Version @@ -13,20 +13,20 @@ libNGLdap_HEADER_FILES_INSTALL_DIR = /NGLdap libNGLdap_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libNGLdap_HEADER_FILES = \ - NGLdap.h \ + NGLdap.h \ \ - EOQualifier+LDAP.h \ - NSString+DN.h \ - NGLdapEntry.h \ - NGLdapConnection.h \ - NGLdapAttribute.h \ - NGLdapModification.h \ + EOQualifier+LDAP.h \ + NSString+DN.h \ + NGLdapEntry.h \ + NGLdapConnection.h \ + NGLdapAttribute.h \ + NGLdapModification.h \ NGLdapSearchResultEnumerator.h \ \ - NGLdapURL.h \ - NGLdapGlobalID.h \ - NGLdapFileManager.h \ - NGLdapDataSource.h \ + NGLdapURL.h \ + NGLdapGlobalID.h \ + NGLdapFileManager.h \ + NGLdapDataSource.h \ libNGLdap_CORE_OBJC_FILES = \ EOQualifier+LDAP.m \ @@ -47,6 +47,4 @@ libNGLdap_OBJC_FILES = \ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/library.make -include GNUmakefile.postamble - -autodoc : - autodoc $(AUTODOC_FLAGS) -dest ../Documentation/NGLdap/ -proj . +-include fhs.make diff --git a/sope-ldap/NGLdap/Version b/sope-ldap/NGLdap/Version index 0a020cb6..475368f3 100644 --- a/sope-ldap/NGLdap/Version +++ b/sope-ldap/NGLdap/Version @@ -1,5 +1,5 @@ -# $Id$ +# $Id: Version 13 2004-08-20 20:08:20Z helge $ MAJOR_VERSION=4 MINOR_VERSION=3 -SUBMINOR_VERSION:=19 +SUBMINOR_VERSION:=20 diff --git a/sope-ldap/NGLdap/fhs.make b/sope-ldap/NGLdap/fhs.make new file mode 100644 index 00000000..27422bdc --- /dev/null +++ b/sope-ldap/NGLdap/fhs.make @@ -0,0 +1,30 @@ +# postprocessing + +# FHS support (this is a hack and is going to be done by gstep-make!) + +ifneq ($(FHS_INSTALL_ROOT),) + +FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ + +fhs-header-dirs :: + $(MKDIRS) $(FHS_INCLUDE_DIR)$(libNGLdap_HEADER_FILES_INSTALL_DIR) + +move-headers-to-fhs :: fhs-header-dirs + @echo "moving headers to $(FHS_INCLUDE_DIR) .." + mv $(GNUSTEP_HEADERS)$(libNGLdap_HEADER_FILES_INSTALL_DIR)/*.h \ + $(FHS_INCLUDE_DIR)$(libNGLdap_HEADER_FILES_INSTALL_DIR)/ + +NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" +NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" + +move-libs-to-fhs :: + @echo "moving libs to $(FHS_LIB_DIR) .." + mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/ + +move-to-fhs :: move-headers-to-fhs move-libs-to-fhs + +after-install :: move-to-fhs + +endif diff --git a/sope-ldap/samples/ChangeLog b/sope-ldap/samples/ChangeLog index 587de7ce..0e1b4e25 100644 --- a/sope-ldap/samples/ChangeLog +++ b/sope-ldap/samples/ChangeLog @@ -1,3 +1,9 @@ +2004-08-29 Helge Hess + + * added hack to install the tools in FHS locations - the executables + will be installed in FHS_INSTALL_ROOT if specified (eg make + FHS_INSTALL_ROOT=/usr/local) + 2004-08-20 Helge Hess * moved in NGLdap samples from sope-core diff --git a/sope-ldap/samples/GNUmakefile b/sope-ldap/samples/GNUmakefile index 67e844ed..6de6f0b5 100644 --- a/sope-ldap/samples/GNUmakefile +++ b/sope-ldap/samples/GNUmakefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: GNUmakefile 13 2004-08-20 20:08:20Z helge $ include $(GNUSTEP_MAKEFILES)/common.make @@ -21,3 +21,4 @@ ldapchkpwd_TOOL_LIBS += -lNGLdap -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble +-include fhs.make diff --git a/sope-ldap/samples/fhs.make b/sope-ldap/samples/fhs.make new file mode 100644 index 00000000..27c85d13 --- /dev/null +++ b/sope-ldap/samples/fhs.make @@ -0,0 +1,26 @@ +# postprocessing + +# FHS support (this is a hack and is going to be done by gstep-make!) + +ifneq ($(FHS_INSTALL_ROOT),) + +FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ + +fhs-bin-dirs :: + $(MKDIRS) $(FHS_BIN_DIR) + +NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)" + +move-tools-to-fhs :: fhs-bin-dirs + @echo "moving tools from $(NONFHS_BINDIR) to $(FHS_BIN_DIR) .." + for i in $(TOOL_NAME); do \ + mv "$(NONFHS_BINDIR)/$${i}" $(FHS_BIN_DIR); \ + done + +move-to-fhs :: move-tools-to-fhs + +after-install :: move-to-fhs + +endif -- 2.39.5