List:Commits« Previous MessageNext Message »
From:paul Date:March 20 2006 6:57pm
Subject:svn commit - mysqldoc@docsrva: r1635 - trunk
View as plain text  
Author: paul
Date: 2006-03-20 19:57:18 +0100 (Mon, 20 Mar 2006)
New Revision: 1635

Log:
 r4004@kite-hub:  paul | 2006-03-20 12:56:46 -0600
 Remove unnecessary stuff from Makefile.


Modified:
   trunk/
   trunk/Makefile


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8822
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4002
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8815
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4004

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2006-03-20 18:31:00 UTC (rev 1634)
+++ trunk/Makefile	2006-03-20 18:57:18 UTC (rev 1635)
@@ -1,45 +1,7 @@
 # mysqldoc top-level Makefile
 
-# Location of repository root relative to current directory
-REPO_ROOT = .
-
-# Location of directory containing Makefile components
-MAKE_DIR = $(REPO_ROOT)/make.d
-
-# Set any variables here that should override imported standard variables
-
-DOC_LANG = en
-
-# Import standard variables
-
-include $(MAKE_DIR)/vars-layout
-include $(MAKE_DIR)/vars-shell
-include $(MAKE_DIR)/vars-docbook
-
 all:
 	@echo "Documents maintained in this directory generally each"
 	@echo "have their own directory.  To work on a document"
 	@echo "(for example, to edit it or to generate output),"
-	@echo "cd into the document directory first.  For example,"
-	@echo "to work on the MySQL 5.0 Reference Manual, cd into"
-	@echo "the refman-5.0 directory."
-
-# catalog.xml.dist is assumed to be located in the repository root
-# directory.  Run "make catalog.xml" there and it will replace
-# instances of @REPO_ROOT@ with the current working directory to
-# create catalog.xml with the correct catalog entry pathnames.
-
-# This is a helper target that exists because:
-# - We need a catalog.xml file that has the full pathnames for the
-#   DocBook DTD and XSL files that are located under the repository
-#   dbk.d directory, but the pathnames depend on where users happen
-#   to have the repository located.
-# - We don't want to require users to create the catalog file themselves.
-
-# Therefore, make operations that need the catalog file check whether
-# it exists.  If not, they cause this target rule to be invoked to create
-# it.  With any luck, this happens automatically and users never need
-# think about it at all.
-
-catalog.xml: catalog.xml.dist
-	sed -e "s!@REPO_ROOT@!$$PWD!g" ./catalog.xml.dist > ./catalog.xml
+	@echo "cd into the document directory first."

Thread
svn commit - mysqldoc@docsrva: r1635 - trunkpaul20 Mar