[PATCH] Marble is not found when installed

[Dirk Hohndel]

On Sun, 2013-10-20 at 22:31 +0300, Miika Turkia wrote:
> This is with Ubuntu. However, that should not be the issue. Make
> install does following:
> 
> cp -f
> -r /home/mturkia/source/subsurface/marbledata/maps //usr/share/subsurface/
> cp -f
> -r /home/mturkia/source/subsurface/marbledata/bitmaps //usr/share/subsurface/
> 
> 
> So the results will end up in /usr/share/subsurface/maps (and same for
> bitmaps). However, the data is looked
> from /usr/share/subsurface/marbledata, when searching for it. If you
> run Subsurface from the source directory, everything is fine, as the
> current directory is also looked when searching for marbledata.
> 

OK, I'll need to talk to Thiago about this. It looks like make install
is doing something inconsistent between Mac and Linux here. I'll
investigate :-)

/D

> 
> On Sun, Oct 20, 2013 at 4:29 PM, Dirk Hohndel <dirk at hohndel.org>
> wrote:
>         
>         I am reasonably certain that I tried that and it failed for
>         me, while
>         what I have there worked for me... but then I haven't slept
>         much in the
>         last 24 hours.
>         
>         Which OS did you encounter the problem with?
>         
>         /D
>         
>         On Sun, 2013-10-20 at 14:43 +0300, Miika Turkia wrote:
>         > We search for marbledata, but this directory is not included
>         in the
>         > installation.
>         >
>         > Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
>         > ---
>         >  subsurface.pro | 2 +-
>         >  1 file changed, 1 insertion(+), 1 deletion(-)
>         >
>         > diff --git a/subsurface.pro b/subsurface.pro
>         > index e992768..ae13f0d 100644
>         > --- a/subsurface.pro
>         > +++ b/subsurface.pro
>         > @@ -168,7 +168,7 @@ else: ICON = subsurface-icon.svg
>         >  MANPAGE = subsurface.1
>         >  XSLT_FILES = xslt
>         >  DOC_FILES = $$OUT_PWD/Documentation/user-manual.html
>         Documentation/images
>         > -MARBLEDIR = marbledata/maps marbledata/bitmaps
>         > +MARBLEDIR = marbledata
>         >  DEPLOYMENT_PLUGIN += imageformats/qjpeg
>         >
>         >  # This information will go into the Windows .rc file and
>         linked into the .exe
>         
>         
>         
> 
>