fixed compilation against SOPE HEAD

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@691 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/Recycler/NGScripting/ChangeLog b/Recycler/NGScripting/ChangeLog
index 61bebc5cafd7a23853c56797610728529834c9e0..938b6095e9839158f2bd7676a99576f9da32a851 100644 (file)
--- a/Recycler/NGScripting/ChangeLog
+++ b/Recycler/NGScripting/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-23  Helge Hess  <helge.hess@skyrix.com>
+
+       * added FHS and config.make support, fixed compilation (v4.5.12)
+
 2004-08-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * moved to SOPE 4.3 (v4.3.11)

diff --git a/Recycler/NGScripting/GNUmakefile b/Recycler/NGScripting/GNUmakefile
index 9e0664a94e0cc9c60edb39e1bab086079b2c91de..fe6489b1939e907833f8fa3283f15daacfdfca68 100644 (file)
--- a/Recycler/NGScripting/GNUmakefile
+++ b/Recycler/NGScripting/GNUmakefile
@@ -1,6 +1,9 @@
-# $Id: GNUmakefile 1 2004-08-20 10:08:27Z znek $
+# GNUstep makefile
 
-include ../common.make
+-include ../../config.make
+include $(GNUSTEP_MAKEFILES)/common.make
+-include ../../Version
+include ./Version
 
 #ADDITIONAL_CPPFLAGS += -DTRACK_JSMEM=1 -DTRACK_JSMEM_RC=1
 
@@ -8,7 +11,9 @@ LIBRARY_NAME = libNGScripting
 
 libNGScripting_HEADER_FILES_DIR         = .
 libNGScripting_HEADER_FILES_INSTALL_DIR = /NGScripting
+FHS_HEADER_FILES_INSTALL_DIR = $(libNGScripting_HEADER_FILES_INSTALL_DIR)
 libNGScripting_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libNGScripting_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 libNGScripting_HEADER_FILES = \
        NSObject+Scripting.h                    \
@@ -26,3 +31,4 @@ autodoc :
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/library.make
 -include GNUmakefile.postamble
+include fhs.make

diff --git a/Recycler/NGScripting/GNUmakefile.preamble b/Recycler/NGScripting/GNUmakefile.preamble
index e3b628453383b76f263507f640a7f3416a07248e..ab1b9e80aee2453059c3e943be9f8083f3072162 100644 (file)
--- a/Recycler/NGScripting/GNUmakefile.preamble
+++ b/Recycler/NGScripting/GNUmakefile.preamble
@@ -23,6 +23,8 @@ libNGScripting_LIB_DIRS += \
        -L../EOControl/$(GNUSTEP_OBJ_DIR)
 endif
 
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+
 
 # Apple
 

diff --git a/Recycler/NGScripting/Version b/Recycler/NGScripting/Version
index 18d07697675a34a59a50f229d3c877aefcb113de..cda34ac9d72a5b695708435677454b874f6e337d 100644 (file)
--- a/Recycler/NGScripting/Version
+++ b/Recycler/NGScripting/Version
@@ -1,3 +1,3 @@
-# $Id: Version 4 2004-08-20 17:04:31Z helge $
+# Version file
 
-SUBMINOR_VERSION:=11
+SUBMINOR_VERSION:=12

diff --git a/Recycler/NGScripting/fhs.make b/Recycler/NGScripting/fhs.make
new file mode 100644 (file)
index 0000000..8e576cd
--- /dev/null
+++ b/Recycler/NGScripting/fhs.make
@@ -0,0 +1,44 @@
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+# NOTE: you need to define FHS_HEADER_FILES_INSTALL_DIR for one library
+
+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)$(FHS_HEADER_FILES_INSTALL_DIR)
+
+fhs-bin-dirs ::
+       $(MKDIRS) $(FHS_BIN_DIR)
+
+
+move-headers-to-fhs :: fhs-header-dirs
+       @echo "moving headers to $(FHS_INCLUDE_DIR) .."
+       mv $(GNUSTEP_HEADERS)$(FHS_HEADER_FILES_INSTALL_DIR)/*.h \
+         $(FHS_INCLUDE_DIR)$(FHS_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 move-tools-to-fhs
+
+after-install :: move-to-fhs
+
+endif