From 35b3cc4bfb5653f543f8bea5c64ed936f76b5270 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sun, 23 Jun 2013 20:40:55 +0200 Subject: [PATCH] skalibs: improved FHS compliance using prefix /usr --- develop/skalibs/skalibs.conf | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/develop/skalibs/skalibs.conf b/develop/skalibs/skalibs.conf index 7493d9a20..c7d17a6cc 100644 --- a/develop/skalibs/skalibs.conf +++ b/develop/skalibs/skalibs.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../skalibs/skalibs.conf -# Copyright (C) 2011 The OpenSDE Project +# Copyright (C) 2011 - 2013 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -13,20 +13,22 @@ # --- SDE-COPYRIGHT-NOTE-END --- if [ "$prefix_auto" = 1 ]; then - prefix="usr/skalibs" + prefix="usr" set_confopt fi # skalibs is following slashpackage confentions srcdir=prog/$pkg-$ver +includedir=/$prefix/include/skalibs + skalibs_conf() { # configure installation directories - echo "$root/$prefix" > conf-compile/conf-home - echo "$root$bindir" > conf-compile/conf-bin - echo "$root$includedir" > conf-compile/conf-include - echo "$root$libdir" > conf-compile/conf-lib - echo "$root$mandir" > conf-compile/conf-man + 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'