Update of /cvsroot/fink/web/xml
In directory vz-cvs-3.sog:/tmp/cvs-serv11409
Modified Files:
Makefile.common
Log Message:
Omit .xml from SOURCE, simplfies code a bit
Index: Makefile.common
===================================================================
RCS file: /cvsroot/fink/web/xml/Makefile.common,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Makefile.common 25 Oct 2011 01:31:57 -0000 1.22
+++ Makefile.common 25 Oct 2011 01:55:44 -0000 1.23
@@ -14,7 +14,7 @@
endif
ifdef LANGUAGES
-SOURCE = $(foreach LANGUAGE, $(LANGUAGES), $(patsubst
%.xml,%.$(LANGUAGE).xml, $(BASE_SOURCE)))
+SOURCE = $(foreach LANGUAGE, $(LANGUAGES), $(BASE_SOURCE).$(LANGUAGE).xml)
#TARGET := $(foreach LANGUAGE, $(LANGUAGES), $(patsubst
%.php,%.$(LANGUAGE).php, $(BASE_TARGET)))
TARGET :=
ifdef STYLESHEET_RDF
@@ -24,6 +24,8 @@
TARGET += $(foreach FILE, $(BASE_TARGET),$(if $(findstring .rdf,$(FILE)),
$(foreach LANGUAGE, $(LANGUAGES), $(patsubst %.rdf,%.$(LANGUAGE).rdf,
$(FILE)))))
endif
TARGET += $(foreach FILE, $(BASE_TARGET),$(if $(findstring .php,$(FILE)),
$(foreach LANGUAGE, $(LANGUAGES), $(patsubst %.php,%.$(LANGUAGE).php,
$(FILE)))))
+else
+SOURCE = $(BASE_SOURCE).xml
endif
ifndef STYLESHEET_WEBSITE
@@ -51,13 +53,13 @@
ifdef WANT_HTML
ifdef LANGUAGES
-ALL_TARGETS += $(foreach LANGUAGE, $(LANGUAGES), $(patsubst
%.xml,%.$(LANGUAGE).html, $(BASE_SOURCE)))
-INSTALL_FILES += $(foreach LANGUAGE, $(LANGUAGES), $(patsubst
%.xml,%.$(LANGUAGE).html, $(BASE_SOURCE)))
-INSTALL_HTML = $(foreach LANGUAGE, $(LANGUAGES), $(patsubst
%.xml,%.$(LANGUAGE).html, $(BASE_SOURCE)))
+ALL_TARGETS += $(foreach LANGUAGE, $(LANGUAGES),
$(BASE_SOURCE).$(LANGUAGE).html)
+INSTALL_FILES += $(foreach LANGUAGE, $(LANGUAGES),
$(BASE_SOURCE).$(LANGUAGE).html)
+INSTALL_HTML = $(foreach LANGUAGE, $(LANGUAGES),
$(BASE_SOURCE).$(LANGUAGE).html)
else
-ALL_TARGETS += $(patsubst %.xml,%.html,$(BASE_SOURCE))
-INSTALL_FILES += $(patsubst %.xml,%.html,$(BASE_SOURCE))
-INSTALL_HTML = $(patsubst %.xml,%.html,$(BASE_SOURCE))
+ALL_TARGETS += $(BASE_SOURCE).html
+INSTALL_FILES += $(BASE_SOURCE).html
+INSTALL_HTML = $(BASE_SOURCE).html
endif
endif
@@ -83,7 +85,7 @@
%.php.tmp: $(SOURCE) $(STYLESHEET_WEBSITE) $(basedir)/finkdoc.dtd
xmllint --noout --valid $(SOURCE)
- $(foreach XMLFILE, $(SOURCE), xsltproc --stringparam PRINTFILE $(subst
.xml,,$(BASE_SOURCE)) --stringparam DESTDIR $(DESTDIR)/ $(STYLESHEET_WEBSITE)
$(XMLFILE); )
+ $(foreach XMLFILE, $(SOURCE), xsltproc --stringparam PRINTFILE
$(BASE_SOURCE) --stringparam DESTDIR $(DESTDIR)/ $(STYLESHEET_WEBSITE)
$(XMLFILE); )
%.php: %.php.tmp $(PROCESS_WEBSITE)
$(PROCESS_WEBSITE) <$< >$@
------------------------------------------------------------------------------
The demand for IT networking professionals continues to grow, and the
demand for specialized networking skills is growing even more rapidly.
Take a complimentary Learning@Cisco Self-Assessment and learn
about Cisco certifications, training, and career opportunities.
http://p.sf.net/sfu/cisco-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
