X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Frelocate.hh;h=c531d97cfb98d496cda307cd1f11a68d7d2b988d;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=c477acaab96e71784b8560383b342d1d5012ea1a;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/include/relocate.hh b/lily/include/relocate.hh
index c477acaab9..c531d97cfb 100644
--- a/lily/include/relocate.hh
+++ b/lily/include/relocate.hh
@@ -1,20 +1,32 @@
 /*
-  relocate.hh -- declare
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef RELOCATE_HH
 #define RELOCATE_HH
 
+#include "std-string.hh"
 
+void read_relocation_dir (const string &dirname);
+void read_relocation_file (const string &filename);
+string expand_environment_variables (const string &orig);
 
-#include "string.hh"
-
-int sane_putenv (char const *key, String value, bool overwrite);
+int sane_putenv (char const *key, const string &value, bool overwrite);
 void setup_paths (char const *argv0);
 extern bool relocate_binary;