mirror of
https://github.com/edeproject/ede.git
synced 2023-08-10 21:13:03 +03:00
Prevented ede-screensaver-conf to crash when xscreensaver is not installed.
Default desktop files will be installed during compilation time; if this was done during installation time, files will be installed in superuser directory, which isn't the goal. Fixed Jamfile to use correct path.
This commit is contained in:
@ -10,9 +10,11 @@
|
||||
|
||||
SubDir TOP data desktop-links ;
|
||||
|
||||
actions InstallIfEmpty
|
||||
actions quietly existing InstallIfEmpty
|
||||
{
|
||||
./$(SUBDIR)/install-in-desktop-dir.sh
|
||||
./$(>)/install-in-desktop-dir.sh
|
||||
}
|
||||
|
||||
InstallIfEmpty install ;
|
||||
# use 'all' pseudotarget not 'install' because 'install' will be often run as superuser, installing
|
||||
# data in superuser directory, not user directory
|
||||
InstallIfEmpty all : $(SUBDIR) ;
|
||||
|
@ -12,6 +12,8 @@ content=`ls $desktop_dir/*.desktop 2>>/dev/null`
|
||||
|
||||
# check if directory is empty and install if it does
|
||||
if test "x$content" = "x"; then
|
||||
echo "Preparing $desktop_dir for the first time..."
|
||||
|
||||
for file in $targets; do
|
||||
cp $curr_dir/$file $desktop_dir
|
||||
done
|
||||
|
Reference in New Issue
Block a user