(datadir): remove LILYPONDPREFIX support.

[lilypond.git] / scripts / lilypond-book.py

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 433f7712fbf23b0b4ac3d9e82a4fbbb1bf71016d..7861c524a568b6ef30b0497bbd6cdad1e4e17ff7 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -36,40 +36,19 @@ import os
 import sys
 import re
 
-# Users of python modules should include this snippet
-# and customize variables below.
-
-# We'll suffer this path initialization stuff as long as we don't install
-# our python packages in <prefix>/lib/pythonX.Y
-
-# If set, LILYPONDPREFIX must take prevalence.
-# if datadir is not set, we're doing a build and LILYPONDPREFIX.
-
 ################
 # RELOCATION
 ################
 
-datadir = '@local_lilypond_datadir@'
-if not os.path.isdir (datadir):
-    datadir = '@lilypond_datadir@'
-
-sys.path.insert (0, os.path.join (datadir, 'python'))
 
-if os.environ.has_key ('LILYPONDPREFIX'):
-    datadir = os.environ['LILYPONDPREFIX']
-    while datadir[-1] == os.sep:
-        datadir = datadir[:-1]
-
-    if not os.path.exists (os.path.join (datadir, 'python/lilylib.py')):
-        datadir = os.path.join (datadir, 'share/lilypond/current/')
-sys.path.insert (0, os.path.join (datadir, 'python'))
+for d in ['@lilypond_datadir@',
+          '@lilypond_libdir@']:
+    sys.path.insert (0, os.path.join (d, 'python'))
 
 # dynamic relocation, for GUB binaries.
-bindir = os.path.split (sys.argv[0])[0]
-
-
-for prefix_component in ['share', 'lib']:
-    datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % prefix_component)
+bindir = os.path.abspath (os.path.split (sys.argv[0])[0])
+for p in ['share', 'lib']:
+    datadir = os.path.abspath (bindir + '/../%s/lilypond/current/python/' % p)
     sys.path.insert (0, datadir)
 
 
@@ -563,7 +542,7 @@ output = {
  \preLilyPondExample%%
 \fi%%
 \def\lilypondbook{}%%
-\input %(base)s-systems.%(texextension)s%%
+\input %(base)s-systems.tex%%
 \ifx\postLilyPondExample \undefined%%
  \relax%%
 \else%%
@@ -1164,9 +1143,6 @@ class Lilypond_snippet (Snippet):
                 verb = self.substring ('code')
                 str += (output[LATEX][VERBATIM] % vars ())
 
-        texextension = 'tex'
-        if global_options.create_pdf:
-            texextension = 'pdftex'
         str += (output[LATEX][OUTPUT] % vars ())
 
         ## todo: maintain breaks