From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Wed, 29 Sep 2004 12:38:52 +0000 (+0000)
Subject: install sope tool in sbin
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a203f4ec8eae423b40532a270bd1eb80f8561d48;p=sope

install sope tool in sbin


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

diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog
index cfe08de5..189cbc2e 100644
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-29  Helge Hess  <helge.hess@skyrix.com>
+
+	* fhs.make: install 'sope' tool in FHS sbin (v4.3.11)
+
 2004-09-27  Helge Hess  <helge.hess@skyrix.com>
 	
 	* GNUmakefile: made 'sope' executable a versioned tool (now called
diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version
index f7255071..d4260269 100644
--- a/sope-appserver/SoOFS/Version
+++ b/sope-appserver/SoOFS/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=9
+SUBMINOR_VERSION:=11
diff --git a/sope-appserver/SoOFS/fhs.make b/sope-appserver/SoOFS/fhs.make
index 1f3b0802..44354d99 100644
--- a/sope-appserver/SoOFS/fhs.make
+++ b/sope-appserver/SoOFS/fhs.make
@@ -7,6 +7,7 @@ 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_SBIN_DIR=$(FHS_INSTALL_ROOT)/sbin/
 FHS_SO_DIR=$(FHS_LIB_DIR)sope-4.3/products/
 
 NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
@@ -20,6 +21,9 @@ fhs-header-dirs ::
 fhs-bin-dirs ::
 	$(MKDIRS) $(FHS_BIN_DIR)
 
+fhs-sbin-dirs ::
+	$(MKDIRS) $(FHS_SBIN_DIR)
+
 fhs-products-dirs ::
 	$(MKDIRS) $(FHS_SO_DIR)
 
@@ -33,10 +37,10 @@ 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) .."
+move-daemons-to-fhs :: fhs-bin-dirs
+	@echo "moving daemons from $(NONFHS_BINDIR) to $(FHS_SBIN_DIR) .."
 	for i in $(TOOL_NAME); do \
-	  mv "$(NONFHS_BINDIR)/$${i}" $(FHS_BIN_DIR); \
+	  mv "$(NONFHS_BINDIR)/$${i}" $(FHS_SBIN_DIR); \
 	done
 
 move-bundles-to-fhs :: fhs-products-dirs
@@ -47,7 +51,7 @@ move-bundles-to-fhs :: fhs-products-dirs
 	  mv "$(BUNDLE_INSTALL_DIR)/$${i}$(BUNDLE_EXTENSION)" $$j; \
 	done
 
-move-to-fhs :: move-headers-to-fhs move-libs-to-fhs move-tools-to-fhs \
+move-to-fhs :: move-headers-to-fhs move-libs-to-fhs move-daemons-to-fhs \
 		move-bundles-to-fhs
 
 after-install :: move-to-fhs