]> err.no Git - sope/commitdiff
added FHS hack
authorhelge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Sun, 29 Aug 2004 20:05:56 +0000 (20:05 +0000)
committerhelge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Sun, 29 Aug 2004 20:05:56 +0000 (20:05 +0000)
git-svn-id: http://svn.opengroupware.org/SOPE/trunk@84 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

13 files changed:
sope-ical/NGiCal/ChangeLog
sope-ical/NGiCal/GNUmakefile
sope-ical/NGiCal/Version
sope-ical/NGiCal/fhs.make [new file with mode: 0644]
sope-ical/iCalSaxDriver/ChangeLog
sope-ical/iCalSaxDriver/GNUmakefile
sope-ical/iCalSaxDriver/Version
sope-ical/iCalSaxDriver/fhs.make [new file with mode: 0644]
sope-ical/samples/ChangeLog
sope-ical/samples/GNUmakefile
sope-ical/samples/GNUmakefile.preamble
sope-ical/samples/common.h [new file with mode: 0644]
sope-ical/samples/fhs.make [new file with mode: 0644]

index 8c46e176238fa9d825bd9ea87004f67bc5ac9dd4..c46f5a8319e14d51c7169f37789ac97081b32062 100644 (file)
@@ -1,3 +1,10 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+
+       * 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  <znek@mulle-kybernetik.com>
 
        * NGiCal.xcode: new Xcode project
index 39e6900347b59955d93934976f69489696e23400..f332cd9d639fb5b6b9950b6c4d228e098578ecd8 100644 (file)
@@ -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
index 792a40a93c01d77dc66407d93b9cd64910894260..45f93b53cd4842420fc9ba2125a11f952a0e68b2 100644 (file)
@@ -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 (file)
index 0000000..d8d5f9b
--- /dev/null
@@ -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
index 98ac342bb06b37b3656eaf420c9b1c3518480c50..1445915d8f266847dbe29fb336927806ffe51401 100644 (file)
@@ -1,3 +1,9 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+       
+       * 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  <helge.hess@skyrix.com>
 
        * GNUmakefile: install SAX driver in Library/SaxDrivers-4.3/ (v4.3.12)
index 7920d30bf33bd2ef2d56b39769e0381822ea42fe..cab03a0f045e72cc4fa23d86d880602e83bf8109 100644 (file)
@@ -16,3 +16,4 @@ iCalSaxDriver_RESOURCE_FILES = bundle-info.plist
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
+-include fhs.make
index 9cef79939ea704d51f0e6725b9964991d0cafe31..92c8fa08c38f073a34665a077f87e34ece0ab9e3 100644 (file)
@@ -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 (file)
index 0000000..ebaa53a
--- /dev/null
@@ -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
index f78f6b578280130f8d59150f2033f19450f492b0..63627214f94ce755c99d8058e79a1bef27616ac2 100644 (file)
@@ -1,3 +1,9 @@
+2004-08-29  Helge Hess  <helge.hess@opengroupware.org>
+
+       * 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  <helge.hess@opengroupware.org>
 
        * subclassing.m: fixed a compiler warning
index 2016d116ffc2ea12cf0d8e1205d68e31742d3925..4f7b1b099af0807aceba2591cddcc684ff0a5e67 100644 (file)
@@ -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
index 33ceafa85e961dcac4779113281e08e6a60f3307..c6ea250e4b77d22699f6688c69fb1769d46ba8a5 100644 (file)
@@ -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 (file)
index 0000000..662c92c
--- /dev/null
@@ -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 <Foundation/Foundation.h>
+
+#if LIB_FOUNDATION_LIBRARY
+#  include <Foundation/exceptions/GeneralExceptions.h>
+#else
+#  include <NGExtensions/NGObjectMacros.h>
+#  include <NGExtensions/NSString+Ext.h>
+#endif
+
+#include <NGExtensions/NGExtensions.h>
diff --git a/sope-ical/samples/fhs.make b/sope-ical/samples/fhs.make
new file mode 100644 (file)
index 0000000..27c85d1
--- /dev/null
@@ -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