From df1ff73839078d35774a3b56516d00518c4988e2 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Mon, 24 Jun 2013 16:25:05 +0200
Subject: [PATCH] skalibs: improved fhs support by using the new support for
 non-slashpackage installations

---
 develop/skalibs/skalibs.conf    | 18 ------------------
 develop/skalibs/skaware-conf.in | 33 +++++++++++++++++++++------------
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/develop/skalibs/skalibs.conf b/develop/skalibs/skalibs.conf
index c7d17a6cc..5aae236f5 100644
--- a/develop/skalibs/skalibs.conf
+++ b/develop/skalibs/skalibs.conf
@@ -21,21 +21,3 @@ fi
 srcdir=prog/$pkg-$ver
 
 includedir=/$prefix/include/skalibs
-
-skalibs_conf() {
-	# configure installation directories
-	eval echo 'root/$prefix'    > conf-compile/conf-home
-	eval echo '$root$bindir'     > conf-compile/conf-bin
-	eval echo '$root$includedir' > conf-compile/conf-include
-	eval echo '$root$libdir'     > conf-compile/conf-lib
-	eval echo '$root$mandir'     > conf-compile/conf-man
-}
-hook_add preconf 1 'skalibs_conf'
-
-skalibs_install() {
-	cp -avp library/* $root$libdir	
-	cp -avp library.so/* $root$libdir	
-	cp -avp include/* $root$includedir	
-	cp -avp sysdeps $root/$prefix
-}
-hook_add postmake 9 'skalibs_install'
diff --git a/develop/skalibs/skaware-conf.in b/develop/skalibs/skaware-conf.in
index 0531a69b1..8ea27de9b 100644
--- a/develop/skalibs/skaware-conf.in
+++ b/develop/skalibs/skaware-conf.in
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../skalibs/skaware-conf.in
-# Copyright (C) 2011 The OpenSDE Project
+# Copyright (C) 2011 - 2013 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -15,10 +15,6 @@
 # do not run the useless configure script dummy
 runconf=0
 
-# do not run make install because we do not want slashpackage convention
-# by default
-makeinstopt=
-
 skaware_conf() {
 	# configure build environment
 	echo "$CC" > conf-compile/conf-cc
@@ -27,13 +23,26 @@ skaware_conf() {
 	echo "$STRIP -R .note -R .comment -R .note.GNU-stack" > conf-compile/conf-stripbins
 	echo "$STRIP -x -R .note -R .comment -R .note.GNU-stack" > conf-compile/conf-striplibs
 
-	# configure packages that depend on skalibs
-	if [ ! $pkg = "skalibs" ]; then
-		pkgprefix -t skalibs
-		echo "$( pkgprefix -r libdir skalibs )" > conf-compile/path-library
-		echo "$( pkgprefix -r libdir skalibs )" > conf-compile/path-library.so
-		echo "$( pkgprefix -r includedir skalibs )" > conf-compile/path-include
-		echo "$( pkgprefix -r skalibs )/sysdeps" > conf-compile/import
+	# do not use slashpackage style fs layout if FHS is used
+	if pkginstalled fhs; then
+		local flag_slashpackage="conf-compile/flag-slashpackage"
+		[ -f $flag_slashpackage ] && rm -vf $flag_slashpackage
+		echo "$root$sysconfdir" > conf-compile/conf-etc
+		echo "$root$mandir" > conf-compile/conf-man
+		echo "$root$bindir" > conf-compile/conf-install-command
+		echo "$root$libdir" > conf-compile/conf-install-library
+		echo "$root$libdir" > conf-compile/conf-install-library.so
+		echo "$root$includedir" > conf-compile/conf-install-include
+		echo "$root$libdir/sysdeps" > conf-compile/conf-install-sysdeps
+
+		# configure packages that depend on skalibs
+		if [ ! $pkg = "skalibs" ]; then
+			pkgprefix -t skalibs
+			echo "$( pkgprefix -r includedir skalibs )" > conf-compile/path-include
+			echo "$( pkgprefix -r libdir skalibs )" > conf-compile/path-library
+			echo "$( pkgprefix -r libdir skalibs )" > conf-compile/path-library.so
+			echo "$( pkgprefix -r libdir skalibs )/sysdeps" > conf-compile/import
+		fi
 	fi
 }
 hook_add preconf 1 'skaware_conf'