From 02937b4144af2c6c12e5b708d6c781b42f060e72 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 4 Aug 2013 14:11:18 +0200
Subject: [PATCH] scripts/install: add support for '$PKG_DIR/system.d' dir and
 install *.d dirs before we run the install script

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 scripts/install | 55 +++++++++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/scripts/install b/scripts/install
index df3a9c6747..b9cba45506 100755
--- a/scripts/install
+++ b/scripts/install
@@ -56,6 +56,36 @@ for p in $PKG_DEPENDS $PKG_DEPENDS_TARGET; do
   $SCRIPTS/install $p
 done
 
+if [ -d $PKG_DIR/init.d ]; then
+  mkdir -p $INSTALL/etc/init.d
+  cp $PKG_DIR/init.d/* $INSTALL/etc/init.d/
+fi
+
+if [ -d $PKG_DIR/profile.d ]; then
+  mkdir -p $INSTALL/etc/profile.d
+  cp $PKG_DIR/profile.d/*.conf $INSTALL/etc/profile.d/
+fi
+
+if [ -d $PKG_DIR/tmpfiles.d ]; then
+  mkdir -p $INSTALL/usr/lib/tmpfiles.d
+  cp $PKG_DIR/tmpfiles.d/*.conf $INSTALL/usr/lib/tmpfiles.d
+fi
+
+if [ -d $PKG_DIR/system.d ]; then
+  mkdir -p $INSTALL/lib/systemd/system
+  cp $PKG_DIR/system.d/*.* $INSTALL/lib/systemd/system
+fi
+
+if [ -d $PKG_DIR/udev.d ]; then
+  mkdir -p $INSTALL/lib/udev/rules.d
+  cp $PKG_DIR/udev.d/*.rules $INSTALL/lib/udev/rules.d
+fi
+
+if [ -d $PKG_DIR/init.network ]; then
+  mkdir -p $INSTALL/etc/init.d/network
+  cp $PKG_DIR/init.network/* $INSTALL/etc/init.d/network/
+fi
+
 if [ -f $PKG_DIR/package.mk ]; then
   # unset functions
     unset -f pre_install
@@ -105,31 +135,6 @@ elif [ -f $PKG_DIR/install ]; then
   $PKG_DIR/install $@ >&$VERBOSE_OUT
 fi
 
-if [ -d $PKG_DIR/init.d ]; then
-  mkdir -p $INSTALL/etc/init.d
-  cp $PKG_DIR/init.d/* $INSTALL/etc/init.d/
-fi
-
-if [ -d $PKG_DIR/profile.d ]; then
-  mkdir -p $INSTALL/etc/profile.d
-  cp $PKG_DIR/profile.d/*.conf $INSTALL/etc/profile.d/
-fi
-
-if [ -d $PKG_DIR/tmpfiles.d ]; then
-  mkdir -p $INSTALL/usr/lib/tmpfiles.d
-  cp $PKG_DIR/tmpfiles.d/*.conf $INSTALL/usr/lib/tmpfiles.d
-fi
-
-if [ -d $PKG_DIR/udev.d ]; then
-  mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_DIR/udev.d/*.rules $INSTALL/lib/udev/rules.d
-fi
-
-if [ -d $PKG_DIR/init.network ]; then
-  mkdir -p $INSTALL/etc/init.d/network
-  cp $PKG_DIR/init.network/* $INSTALL/etc/init.d/network/
-fi
-
 for i in `sed -n "s/^\([^#].*\)=\".*$/\1/p" $PROJECT_DIR/$PROJECT/options | grep -v "#"`; do
   eval val=\$$i
   echo "STAMP_$i=\"$val"\" >> $STAMP