Commit e097687e authored by Guillaume Lazzara's avatar Guillaume Lazzara Committed by Roland Levillain
Browse files

Fix paths in the SCRIBO viewer.



	* demo/viewer/demodir.hh.in (SCRIBO_PREFIX_BINDIR): Remove macro.
	(SCRIBO_PREFIX_LIBEXECDIR): New macro.
	* demo/viewer/runner.cc:
	s/SCRIBO_PREFIX_BINDIR/SCRIBO_PREFIX_LIBEXECDIR/.
	* demo/viewer/Makefile.am (do_subst): Substitute $libexecdir.
Signed-off-by: Roland Levillain's avatarRoland Levillain <roland@lrde.epita.fr>
parent 9c87359f
2011-09-19 Guillaume Lazzara <z@lrde.epita.fr>
Fix paths in the SCRIBO viewer.
* demo/viewer/demodir.hh.in (SCRIBO_PREFIX_BINDIR): Remove macro.
(SCRIBO_PREFIX_LIBEXECDIR): New macro.
* demo/viewer/runner.cc:
s/SCRIBO_PREFIX_BINDIR/SCRIBO_PREFIX_LIBEXECDIR/.
* demo/viewer/Makefile.am (do_subst): Substitute $libexecdir.
2011-09-15 Guillaume Lazzara <lazzara@caroussel.lrde.epita.fr> 2011-09-15 Guillaume Lazzara <lazzara@caroussel.lrde.epita.fr>
Adjust font size in PDF reconstruction. Adjust font size in PDF reconstruction.
......
...@@ -113,7 +113,7 @@ noinst_HEADERS = viewer.hh \ ...@@ -113,7 +113,7 @@ noinst_HEADERS = viewer.hh \
# Generated files # Generated files
do_subst = sed \ do_subst = sed \
-e 's|@bindir[@]|$(bindir)|g' \ -e 's|@libexecdir[@]|$(libexecdir)|g' \
-e 's|@abs_demodir[@]|$(abs_top_builddir)/scribo/demo|g' -e 's|@abs_demodir[@]|$(abs_top_builddir)/scribo/demo|g'
demodir.hh: $(srcdir)/demodir.hh.in Makefile demodir.hh: $(srcdir)/demodir.hh.in Makefile
......
// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) // Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE)
// //
// This file is part of Olena. // This file is part of Olena.
// //
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
# define SCRIBO_DEMO_DEMODIR_HH # define SCRIBO_DEMO_DEMODIR_HH
# define SCRIBO_PREFIX_BINDIR "@bindir@" # define SCRIBO_PREFIX_LIBEXECDIR "@libexecdir@"
# define SCRIBO_LOCAL_DEMODIR "@abs_demodir@" # define SCRIBO_LOCAL_DEMODIR "@abs_demodir@"
......
...@@ -41,9 +41,9 @@ QString get_pathto(const QString& file, ...@@ -41,9 +41,9 @@ QString get_pathto(const QString& file,
if (f.exists()) if (f.exists())
return SCRIBO_LOCAL_DEMODIR "/" + localdirsuffix; return SCRIBO_LOCAL_DEMODIR "/" + localdirsuffix;
f.setFileName(SCRIBO_PREFIX_BINDIR "/" + file); f.setFileName(SCRIBO_PREFIX_LIBEXECDIR "/" + file);
if (f.exists()) if (f.exists())
return SCRIBO_PREFIX_BINDIR; return SCRIBO_PREFIX_LIBEXECDIR;
qDebug() << "FATAL ERROR: Can't locate file: " + file; qDebug() << "FATAL ERROR: Can't locate file: " + file;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment