[csw-devel] SF.net SVN: gar:[2350] csw/trunk/utils/asciidoc

[bdwalton at users.sourceforge.net]

Revision: 2350
          http://gar.svn.sourceforge.net/gar/?rev=2350&view=rev
Author:   bdwalton
Date:     2008-11-24 16:30:16 +0000 (Mon, 24 Nov 2008)

Log Message:
-----------
Cleaned up the etc/ files for asciidoc...I'd misread the provided install.sh
script when creating the Makefile.  Anything in etc/ is now under asciidoc/.

Modified Paths:
--------------
    csw/trunk/utils/asciidoc/Makefile
    csw/trunk/utils/asciidoc/checksums
    csw/trunk/utils/asciidoc/files/Makefile.in

Modified: csw/trunk/utils/asciidoc/Makefile
===================================================================
--- csw/trunk/utils/asciidoc/Makefile	2008-11-24 02:30:21 UTC (rev 2349)
+++ csw/trunk/utils/asciidoc/Makefile	2008-11-24 16:30:16 UTC (rev 2350)
@@ -24,6 +24,8 @@
 
 include ../category.mk
 
+# until the autoconf stuff is included upstream, we'll maintain and import our
+# own.
 pre-configure:
 	( cd $(WORKSRC); \
 		for f in $(AUTOFILES); do \

Modified: csw/trunk/utils/asciidoc/checksums
===================================================================
--- csw/trunk/utils/asciidoc/checksums	2008-11-24 02:30:21 UTC (rev 2349)
+++ csw/trunk/utils/asciidoc/checksums	2008-11-24 16:30:16 UTC (rev 2350)
@@ -2,5 +2,5 @@
 38527e11ffe879f2cac4a63b6268b4ca  download/CSWasciidoc.gspec
 204ab2546bda5c6fb0510ba8e366db7d  download/CSWasciidoc.depend
 eb3746ffca8e4d487e101ee2501d70a6  download/configure.ac
-c2d5c223c17a32c677a5abf8fa45c1d3  download/Makefile.in
+aed585d6f350e23f80f154da0f807e07  download/Makefile.in
 73ee16f14b22fabd675e78102289b5cc  download/install-sh

Modified: csw/trunk/utils/asciidoc/files/Makefile.in
===================================================================
--- csw/trunk/utils/asciidoc/files/Makefile.in	2008-11-24 02:30:21 UTC (rev 2349)
+++ csw/trunk/utils/asciidoc/files/Makefile.in	2008-11-24 16:30:16 UTC (rev 2350)
@@ -16,6 +16,8 @@
 
 VPATH = @srcdir@
 
+ASCIIDOCCONF = $(sysconfdir)/asciidoc
+
 prog = asciidoc.py a2x
 progdir = $(bindir)
 
@@ -25,28 +27,28 @@
 manpdir = $(mandir)/man1
 
 conf = $(wildcard *.conf)
-confdir = $(sysconfdir)
+confdir = $(ASCIIDOCCONF)
 
 filters = $(wildcard filters/*.py)
-filtersdir = $(sysconfdir)/filters
+filtersdir = $(ASCIIDOCCONF)/filters
 
 docbook = $(wildcard docbook-xsl/*xsl)
-docbookdir = $(sysconfdir)/docbook-xsl
+docbookdir = $(ASCIIDOCCONF)/docbook-xsl
 
 dblatex = $(wildcard dblatex/*.xsl) $(wildcard dblatex/*.sty)
-dblatexdir = $(sysconfdir)/dblatex
+dblatexdir = $(ASCIIDOCCONF)/dblatex
 
 css = $(wildcard stylesheets/*.css)
-cssdir = $(sysconfdir)/stylesheets
+cssdir = $(ASCIIDOCCONF)/stylesheets
 
 js = $(wildcard javascripts/*.js)
-jsdir = $(sysconfdir)/javascripts
+jsdir = $(ASCIIDOCCONF)/javascripts
 
 callouts = $(wildcard images/icons/callouts/*)
-calloutsdir = $(sysconfdir)/images/icons/callouts
+calloutsdir = $(ASCIIDOCCONF)/images/icons/callouts
 
 icons = $(wildcard images/icons/*.png) images/icons/README
-iconsdir = $(sysconfdir)/images/icons
+iconsdir = $(ASCIIDOCCONF)/images/icons
 
 doc = $(wildcard README*) $(wildcard BUGS*) $(wildcard INSTALL*)
 docdir = $(datadir)/doc/asciidoc
@@ -90,7 +92,7 @@
 fixconfpath:
 	@for f in $(prog); do \
 		echo "Fixing CONF_DIR in $$f"; \
-		$(SED) "s#^CONF_DIR = '.*'#CONF_DIR = '$(sysconfdir)'#; s#^CONF_DIR=.*#CONF_DIR=$(sysconfdir)#" $$f > $$f.out; \
+		$(SED) "s#^CONF_DIR = '.*'#CONF_DIR = '$(ASCIIDOCCONF)'#; s#^CONF_DIR=.*#CONF_DIR=$(ASCIIDOCCONF)#" $$f > $$f.out; \
 		mv $$f.out $$f; \
 	done
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.