From 6f81d26738a06adb9c59d51a57f08581cf7272b5 Mon Sep 17 00:00:00 2001 From: longchair Date: Wed, 13 Apr 2016 08:56:33 +0200 Subject: [PATCH] distros : config files paths fixups --- packages/network/samba/package.mk | 4 ++-- packages/tools/bcm2835-bootloader/package.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 8663b352cc..f8608739d3 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -174,9 +174,9 @@ makeinstall_target() { if [ -f $PROJECT_DIR/$PROJECT/config/smb.conf ]; then mkdir -p $INSTALL/etc/samba cp $PROJECT_DIR/$PROJECT/config/smb.conf $INSTALL/etc/samba - elif [ -f $DISTRO_DIR/config/smb.conf ]; then + elif [ -f $DISTRO_DIR/$DISTRO/config/smb.conf ]; then mkdir -p $INSTALL/etc/samba - cp $DISTRO_DIR/config/smb.conf $INSTALL/etc/samba + cp $DISTRO_DIR/$DISTRO/config/smb.conf $INSTALL/etc/samba else mkdir -p $INSTALL/etc/samba cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 6b3e904c6d..5204ab1677 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -45,8 +45,8 @@ makeinstall_target() { cp -PRv $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader - if [ -f $DISTRO_DIR/config/config.txt ]; then - cp -PRv $DISTRO_DIR/config/config.txt $INSTALL/usr/share/bootloader + if [ -f $DISTRO_DIR/$DISTRO/config/config.txt ]; then + cp -PRv $DISTRO_DIR/$DISTRO/config/config.txt $INSTALL/usr/share/bootloader else cp -PRv $PKG_DIR/files/3rdparty/bootloader/config.txt $INSTALL/usr/share/bootloader fi