From c079a32bf98291de21c3217d28c9a91a54004ea9 Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 29 Aug 2004 20:05:56 +0000 Subject: [PATCH] added FHS hack git-svn-id: http://svn.opengroupware.org/SOPE/trunk@84 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-ical/NGiCal/ChangeLog | 7 ++++++ sope-ical/NGiCal/GNUmakefile | 7 +++--- sope-ical/NGiCal/Version | 4 ++-- sope-ical/NGiCal/fhs.make | 30 +++++++++++++++++++++++++ sope-ical/iCalSaxDriver/ChangeLog | 6 +++++ sope-ical/iCalSaxDriver/GNUmakefile | 1 + sope-ical/iCalSaxDriver/Version | 2 +- sope-ical/iCalSaxDriver/fhs.make | 25 +++++++++++++++++++++ sope-ical/samples/ChangeLog | 6 +++++ sope-ical/samples/GNUmakefile | 11 +++++---- sope-ical/samples/GNUmakefile.preamble | 13 ++++++----- sope-ical/samples/common.h | 31 ++++++++++++++++++++++++++ sope-ical/samples/fhs.make | 26 +++++++++++++++++++++ 13 files changed, 152 insertions(+), 17 deletions(-) create mode 100644 sope-ical/NGiCal/fhs.make create mode 100644 sope-ical/iCalSaxDriver/fhs.make create mode 100644 sope-ical/samples/common.h create mode 100644 sope-ical/samples/fhs.make diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog index 8c46e176..c46f5a83 100644 --- a/sope-ical/NGiCal/ChangeLog +++ b/sope-ical/NGiCal/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.27) + 2004-08-26 Marcus Mueller * NGiCal.xcode: new Xcode project diff --git a/sope-ical/NGiCal/GNUmakefile b/sope-ical/NGiCal/GNUmakefile index 39e69003..f332cd9d 100644 --- a/sope-ical/NGiCal/GNUmakefile +++ b/sope-ical/NGiCal/GNUmakefile @@ -1,4 +1,4 @@ -# $Id$ +# $Id: GNUmakefile 32 2004-08-21 00:50:30Z helge $ include $(GNUSTEP_MAKEFILES)/common.make include ./Version @@ -46,9 +46,10 @@ libNGiCal_OBJC_FILES = \ iCalDataSource.m \ # NSString+ICal.m \ -#IcalElements.m -#IcalResponse.m +# IcalElements.m +# IcalResponse.m -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/library.make -include GNUmakefile.postamble +-include fhs.make diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version index 792a40a9..45f93b53 100644 --- a/sope-ical/NGiCal/Version +++ b/sope-ical/NGiCal/Version @@ -1,5 +1,5 @@ -# $Id$ +# $Id: Version 12 2004-08-20 19:49:55Z helge $ MAJOR_VERSION=4 MINOR_VERSION=3 -SUBMINOR_VERSION:=26 +SUBMINOR_VERSION:=27 diff --git a/sope-ical/NGiCal/fhs.make b/sope-ical/NGiCal/fhs.make new file mode 100644 index 00000000..d8d5f9b8 --- /dev/null +++ b/sope-ical/NGiCal/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)$(libNGiCal_HEADER_FILES_INSTALL_DIR) + +move-headers-to-fhs :: fhs-header-dirs + @echo "moving headers to $(FHS_INCLUDE_DIR) .." + mv $(GNUSTEP_HEADERS)$(libNGiCal_HEADER_FILES_INSTALL_DIR)/*.h \ + $(FHS_INCLUDE_DIR)$(libNGiCal_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-ical/iCalSaxDriver/ChangeLog b/sope-ical/iCalSaxDriver/ChangeLog index 98ac342b..1445915d 100644 --- a/sope-ical/iCalSaxDriver/ChangeLog +++ b/sope-ical/iCalSaxDriver/ChangeLog @@ -1,3 +1,9 @@ +2004-08-29 Helge Hess + + * added hack to install the project in FHS locations - the SAX driver + will be installed in FHS_INSTALL_ROOT if specified (eg make + FHS_INSTALL_ROOT=/usr/local) (v4.3.13) + 2004-08-24 Helge Hess * GNUmakefile: install SAX driver in Library/SaxDrivers-4.3/ (v4.3.12) diff --git a/sope-ical/iCalSaxDriver/GNUmakefile b/sope-ical/iCalSaxDriver/GNUmakefile index 7920d30b..cab03a0f 100644 --- a/sope-ical/iCalSaxDriver/GNUmakefile +++ b/sope-ical/iCalSaxDriver/GNUmakefile @@ -16,3 +16,4 @@ iCalSaxDriver_RESOURCE_FILES = bundle-info.plist -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble +-include fhs.make diff --git a/sope-ical/iCalSaxDriver/Version b/sope-ical/iCalSaxDriver/Version index 9cef7993..92c8fa08 100644 --- a/sope-ical/iCalSaxDriver/Version +++ b/sope-ical/iCalSaxDriver/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=12 +SUBMINOR_VERSION:=13 diff --git a/sope-ical/iCalSaxDriver/fhs.make b/sope-ical/iCalSaxDriver/fhs.make new file mode 100644 index 00000000..ebaa53ae --- /dev/null +++ b/sope-ical/iCalSaxDriver/fhs.make @@ -0,0 +1,25 @@ +# postprocessing + +# FHS support (this is a hack and is going to be done by gstep-make!) + +ifneq ($(FHS_INSTALL_ROOT),) + +FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ +FHS_SAX_DIR=$(FHS_LIB_DIR)sope-4.3/saxdrivers/ + +fhs-sax-dirs :: + $(MKDIRS) $(FHS_SAX_DIR) + +move-bundles-to-fhs :: fhs-sax-dirs + @echo "moving bundles $(BUNDLE_INSTALL_DIR) to $(FHS_SAX_DIR) .." + for i in $(BUNDLE_NAME); do \ + j="$(FHS_SAX_DIR)/$${i}$(BUNDLE_EXTENSION)"; \ + if test -d $$j; then rm -r $$j; fi; \ + mv "$(BUNDLE_INSTALL_DIR)/$${i}$(BUNDLE_EXTENSION)" $$j; \ + done + +move-to-fhs :: move-bundles-to-fhs + +after-install :: move-to-fhs + +endif diff --git a/sope-ical/samples/ChangeLog b/sope-ical/samples/ChangeLog index f78f6b57..63627214 100644 --- a/sope-ical/samples/ChangeLog +++ b/sope-ical/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-17 Helge Hess * subclassing.m: fixed a compiler warning diff --git a/sope-ical/samples/GNUmakefile b/sope-ical/samples/GNUmakefile index 2016d116..4f7b1b09 100644 --- a/sope-ical/samples/GNUmakefile +++ b/sope-ical/samples/GNUmakefile @@ -1,13 +1,11 @@ -# $Id$ +# $Id: GNUmakefile 9 2004-08-20 18:40:42Z helge $ include $(GNUSTEP_MAKEFILES)/common.make -TOOL_NAME = \ - ical2 \ - ical3 \ +TOOL_NAME = ical2 ical3 -ical2_OBJC_FILES = ical2.m -ical3_OBJC_FILES = ical3.m +ical2_OBJC_FILES = ical2.m +ical3_OBJC_FILES = ical3.m ical2_TOOL_LIBS += -lNGiCal -lSaxObjC ical3_TOOL_LIBS += -lNGiCal -lSaxObjC @@ -15,3 +13,4 @@ ical3_TOOL_LIBS += -lNGiCal -lSaxObjC -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble +-include fhs.make diff --git a/sope-ical/samples/GNUmakefile.preamble b/sope-ical/samples/GNUmakefile.preamble index 33ceafa8..c6ea250e 100644 --- a/sope-ical/samples/GNUmakefile.preamble +++ b/sope-ical/samples/GNUmakefile.preamble @@ -1,4 +1,4 @@ -# $Id$ +# $Id: GNUmakefile.preamble 9 2004-08-20 18:40:42Z helge $ ADDITIONAL_INCLUDE_DIRS += \ -I.. \ @@ -6,10 +6,13 @@ ADDITIONAL_INCLUDE_DIRS += \ -I../NGExtensions \ ADDITIONAL_LIB_DIRS += \ - -L../EOControl/$(GNUSTEP_OBJ_DIR) \ - -L../NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L../NGStreams/$(GNUSTEP_OBJ_DIR) \ - -L../NGiCal/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) \ + -L../NGiCal/$(GNUSTEP_OBJ_DIR) \ + -L/usr/local/lib -L/usr/lib ADDITIONAL_TOOL_LIBS += \ diff --git a/sope-ical/samples/common.h b/sope-ical/samples/common.h new file mode 100644 index 00000000..662c92cc --- /dev/null +++ b/sope-ical/samples/common.h @@ -0,0 +1,31 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#import + +#if LIB_FOUNDATION_LIBRARY +# include +#else +# include +# include +#endif + +#include diff --git a/sope-ical/samples/fhs.make b/sope-ical/samples/fhs.make new file mode 100644 index 00000000..27c85d13 --- /dev/null +++ b/sope-ical/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