From 00d5eb1359785e92befb0c3c505b3e674cbd5878 Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 29 Aug 2004 23:00:19 +0000 Subject: [PATCH] added hack to install in FHS to WOXMl git-svn-id: http://svn.opengroupware.org/SOPE/trunk@91 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/WOXML/ChangeLog | 7 ++++++ sope-appserver/WOXML/GNUmakefile | 1 + sope-appserver/WOXML/Version | 2 +- sope-appserver/WOXML/fhs.make | 39 ++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 sope-appserver/WOXML/fhs.make diff --git a/sope-appserver/WOXML/ChangeLog b/sope-appserver/WOXML/ChangeLog index 01a184db..2ba79d72 100644 --- a/sope-appserver/WOXML/ChangeLog +++ b/sope-appserver/WOXML/ChangeLog @@ -1,3 +1,10 @@ +2004-08-40 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.7) + 2004-08-20 Helge Hess * moved to SOPE 4.3 (v4.3.6) diff --git a/sope-appserver/WOXML/GNUmakefile b/sope-appserver/WOXML/GNUmakefile index c6a3c0ec..8e3bfd89 100644 --- a/sope-appserver/WOXML/GNUmakefile +++ b/sope-appserver/WOXML/GNUmakefile @@ -26,3 +26,4 @@ libWOXML_HEADER_FILES_INSTALL_DIR = /WOXML -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/library.make -include GNUmakefile.postamble +-include fhs.make diff --git a/sope-appserver/WOXML/Version b/sope-appserver/WOXML/Version index 0eb47da3..cab297dc 100644 --- a/sope-appserver/WOXML/Version +++ b/sope-appserver/WOXML/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=6 +SUBMINOR_VERSION:=7 diff --git a/sope-appserver/WOXML/fhs.make b/sope-appserver/WOXML/fhs.make new file mode 100644 index 00000000..5b5c08eb --- /dev/null +++ b/sope-appserver/WOXML/fhs.make @@ -0,0 +1,39 @@ +# 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/ + +NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" +NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" +NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)" + + +fhs-header-dirs :: + $(MKDIRS) $(FHS_INCLUDE_DIR)$(libWOXML_HEADER_FILES_INSTALL_DIR) + + +move-headers-to-fhs :: fhs-header-dirs + @echo "moving headers to $(FHS_INCLUDE_DIR) .." + mv $(GNUSTEP_HEADERS)$(libWOXML_HEADER_FILES_INSTALL_DIR)/*.h \ + $(FHS_INCLUDE_DIR)$(libWOXML_HEADER_FILES_INSTALL_DIR)/ + +move-libs-to-fhs :: + @echo "moving libs to $(FHS_LIB_DIR) .." + mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/ + +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-headers-to-fhs move-libs-to-fhs + +after-install :: move-to-fhs + +endif -- 2.39.5