[svnbook commit] r1205 - in trunk/src: en tools tools/bin

maxb svnbook-dev at red-bean.com
Sun Apr 3 13:22:31 CDT 2005


Author: maxb
Date: Sun Apr  3 13:22:30 2005
New Revision: 1205

Added:
   trunk/src/tools/bin/find-xsl.py
      - copied, changed from r1204, trunk/src/tools/find-xsl.py
Removed:
   trunk/src/tools/find-xsl.py
Modified:
   trunk/src/en/Makefile
Log:
Move find-xsl.py into the tools/bin directory.

* tools/find-xsl.py: Move...
* tools/bin/find-xsl.py: ...here, and adjust relative path in script.
* en/Makefile (ENSURE_XSL): Adjust to above, and move to more appropriate
    location in file.


Modified: trunk/src/en/Makefile
==============================================================================
--- trunk/src/en/Makefile	(original)
+++ trunk/src/en/Makefile	Sun Apr  3 13:22:30 2005
@@ -1,4 +1,3 @@
-ENSURE_XSL = if ! test -e "$(TOOLS_DIR)/xsl"; then $(TOOLS_DIR)/find-xsl.py; fi
 XSLTPROC = xsltproc
 INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
 INSTALL = install
@@ -26,6 +25,8 @@
 XSL_HTML = $(TOOLS_DIR)/html-stylesheet.xsl
 XSL_HTML_CHUNK = $(TOOLS_DIR)/chunk-stylesheet.xsl
 
+ENSURE_XSL = if ! test -e "$(TOOLS_DIR)/xsl"; \
+	     then $(TOOLS_DIR)/bin/find-xsl.py; fi
 RUN_FOP = $(TOOLS_DIR)/bin/run-fop.sh
 
 # Book xsltproc options for HTML output

Copied: trunk/src/tools/bin/find-xsl.py (from r1204, trunk/src/tools/find-xsl.py)
==============================================================================
--- trunk/src/tools/find-xsl.py	(original)
+++ trunk/src/tools/bin/find-xsl.py	Sun Apr  3 13:22:30 2005
@@ -11,8 +11,8 @@
     )
 #######################################################
 
-tools_dir = os.path.dirname(sys.argv[0])
-xsl_dir = os.path.join(tools_dir, 'xsl')
+tools_bin_dir = os.path.dirname(sys.argv[0])
+xsl_dir = os.path.join(tools_bin_dir, '..', 'xsl')
 
 if os.path.exists(xsl_dir):
   print "XSL directory %s already exists" % (xsl_dir,)



More information about the svnbook-dev mailing list