Merge pull request #148 from plexinc/upstream-pathfixups

distros : config files paths fixups
This commit is contained in:
Lukas Rusak 2016-04-13 00:17:01 -07:00
commit 7d66bd9d91
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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