From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Mon, 31 Jul 2006 19:37:38 +0000 (+0000)
Subject: move globals.inc.php into include, no more include/platal \o/
X-Git-Tag: xorg/0.9.11~157
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;ds=sidebyside;h=c4c8da69a5718740241d4f11c2f6cc3bba447396;p=platal.git

move globals.inc.php into include, no more include/platal \o/

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@758 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/Makefile b/Makefile
index 1a31049..b1591ba 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ q:
 ## core
 ##
 
-core: spool/templates_c include/platal/globals.inc.php
+core: spool/templates_c include/globals.inc.php
 
 spool/templates_c spool/uploads:
 	mkdir -p $@
diff --git a/include/platal/globals.inc.php.in b/include/globals.inc.php.in
similarity index 100%
rename from include/platal/globals.inc.php.in
rename to include/globals.inc.php.in
diff --git a/include/xnet.inc.php b/include/xnet.inc.php
index 6b58906..9b8679c 100644
--- a/include/xnet.inc.php
+++ b/include/xnet.inc.php
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 require_once('platal.inc.php');
-require_once('platal/globals.inc.php');
+require_once('globals.inc.php');
 require_once('xnet/session.inc.php');
 $globals = new PlatalGlobals('XnetSession');
 XnetSession::init();
diff --git a/include/xorg.inc.php b/include/xorg.inc.php
index b473e1f..e26b20c 100644
--- a/include/xorg.inc.php
+++ b/include/xorg.inc.php
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 require_once('platal.inc.php');
-require_once('platal/globals.inc.php');
+require_once('globals.inc.php');
 require_once('xorg/session.inc.php');
 $globals = new PlatalGlobals('XorgSession');
 XorgSession::init();