[gedit-latex] Fix running uninstalled



commit 2a11aa395e57ee4c25dfd9d01be268438b6e44a9
Author: John Stowers <john stowers gmail com>
Date:   Mon Feb 13 21:47:39 2012 +0100

    Fix running uninstalled

 INSTALL                 |    9 +++++++--
 latex/appactivatable.py |   10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index 7d1c323..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
 
    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
 
 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
 
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
    On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
 a workaround.  If GNU CC is not installed, it is therefore recommended
diff --git a/latex/appactivatable.py b/latex/appactivatable.py
index 6641170..c5eb990 100644
--- a/latex/appactivatable.py
+++ b/latex/appactivatable.py
@@ -32,17 +32,17 @@ class LaTeXAppActivatable(GObject.Object, Gedit.AppActivatable):
 
     def do_activate(self):
         if platform.platform() == 'Windows':
-            latexdir = os.path.expanduser('~/gedit/latex')
+            userdir = os.path.expanduser('~/gedit/latex')
         else:
-            latexdir = os.path.join(GLib.get_user_config_dir(), 'gedit/latex')
+            userdir = os.path.join(GLib.get_user_config_dir(), 'gedit/latex')
 
         #check if running from srcdir and if so, prefer that for all data files
         me = os.path.realpath(os.path.dirname(__file__))
-        if os.path.exists(os.path.join(me, "..", "..", "configure.ac")):
-            sysdir = os.path.abspath(os.path.join(me, "..", "..", "data"))
+        if os.path.exists(os.path.join(me, "..", "configure.ac")):
+            sysdir = os.path.abspath(os.path.join(me, "..", "data"))
         else:
             sysdir = self.plugin_info.get_data_dir()
 
-        Resources().set_dirs(latexdir, sysdir)
+        Resources().set_dirs(userdir, sysdir)
 
 # ex:ts=4:et



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]