Author: ug Date: Thu Feb 2 11:54:14 2012 New Revision: 67348 URL: http://svn.opensuse.org/viewcvs/yast?rev=67348&view=rev Log: fixed the docu build, deactivated pdf build ... holy cow Modified: trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/doc/Makefile.am trunk/autoinstallation/doc/xml/Makefile.am Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.in?rev=67348&r1=67347&r2=67348&view=diff ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Thu Feb 2 11:54:14 2012 @@ -3,7 +3,7 @@ @HEADER@ Group: System/YaST License: GPL-2.0+ -BuildRequires: yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp +BuildRequires: yast2-mouse yast2-transfer yast2-bootloader xorg-x11-libs yast2-devtools pkg-config libxslt perl-XML-Writer docbook-xsl-stylesheets sgml-skel yast2-testsuite update-desktop-files yast2-country yast2-slp daps python-xml # API for Disabled Modules (ProductControl) BuildRequires: yast2 >= 2.16.36 # After API cleanup Modified: trunk/autoinstallation/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Makefile.am?rev=67348&r1=67347&r2=67348&view=diff ============================================================================== --- trunk/autoinstallation/doc/Makefile.am (original) +++ trunk/autoinstallation/doc/Makefile.am Thu Feb 2 11:54:14 2012 @@ -4,24 +4,25 @@ # $Id$ # -#SUBDIRS = xml +SUBDIRS = xml entities bin examples #htmldir = $(docdir)/html +EXTRA_DIST = ENV* -html_DATA = html -doc_DATA = pdf +#html_DATA = html +#doc_DATA = pdf -html: - $(MAKE) -C xml html +#html: +# $(MAKE) -C xml html -pdf: - $(MAKE) -C xml pdf +#pdf: +# $(MAKE) -C xml pdf pkgsrc: $(MAKE) -C xml pkgsrc -html-debug: - $(MAKE) -C xml pkgsrc +#html-debug: +# $(MAKE) -C xml pkgsrc bigfile: $(MAKE) -C xml ay_bigfile.xml Modified: trunk/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Makefile.am?rev=67348&r1=67347&r2=67348&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/Makefile.am (original) +++ trunk/autoinstallation/doc/xml/Makefile.am Thu Feb 2 11:54:14 2012 @@ -4,7 +4,7 @@ # $Id: Makefile.am 63765 2011-04-11 15:40:31Z ug $ # -SUBDIRS = images +SUBDIRS = images entities htmldir = $(docdir)/html xml_file = autoyast.xml @@ -22,8 +22,8 @@ STYLESHEET_CSS = default.css -html_DATA = html -doc_DATA = pdf +#html_DATA = html +#doc_DATA = pdf DAPS_BASE := $(shell readlink -f ..) @@ -35,21 +35,25 @@ #doc_DATA = autoyast.pdf -.PHONY: pdf html pkgsrc html-debug entities +#.PHONY: pdf html pkgsrc html-debug entities +.PHONY: html pkgsrc html-debug entities html: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -html: RESULTDIR := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) html-dir-name 2>/dev/null) +html: RESULTDIR="..//build/autoyast/html/autoyast" +#html: RESULTDIR := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) html-dir-name 2>/dev/null) html: daps -e ENV-autoyast --basedir=$(DAPS_BASE) html --static rm -rf html && mkdir -p html cp -a $(RESULTDIR)/* html -pdf: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -pdf: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) -pdf: - daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color - mkdir -p pdf - cp -a $(PDF_FILE) pdf +#pdf: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml +#pdf: PDF_FILE="..//build/autoyast/autoyast_en.pdf" +#pdf: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) +#pdf: +# daps -e ENV-autoyast --basedir=$(DAPS_BASE) pdf-color +# mkdir -p pdf +# echo "$(PDF_FILE) xxx" +# cp -a $(PDF_FILE) pdf pkgsrc: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml daps -e ENV-autoyast --basedir=$(DAPS_BASE) package-src @@ -77,7 +81,6 @@ # was: images/PNG/*.png prep-daps-images: mkdir -p ../images/src/png - cp -axu ../autoyast2/img/*.png ../images/src/png ay_bigfile_docbook.xml: autoyast.xml $(xml_files) prep-daps-images entities # Remove internal entity statements @@ -102,14 +105,16 @@ ay_bigfile.xml: ay_bigfile_docbook.xml xsltproc --output $@ \ - /usr/share/susedoc/xslt/misc/db2novdoc.xsl $< + /usr/share/daps/xslt/misc/db2novdoc.xsl $< -install-data-local: html pdf -install-data-local: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) +#install-data-local: html pdf +install-data-local: html +#install-data-local: PDF_FILE="..//build/autoyast/autoyast_en.pdf" +#install-data-local: PDF_FILE := $(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) install-data-local: install -d -m 755 $(DESTDIR)$(htmldir) cp -a $(srcdir)/html/* $(DESTDIR)$(htmldir) - cp -a $(srcdir)/$(shell basename $(PDF_FILE)) $(docdir) +# cp -a $(srcdir)/$(shell basename $(PDF_FILE)) $(docdir) # cp -a $(srcdir)/html/images $(DESTDIR)$(htmldir) # cp -a $(srcdir)/html/img $(DESTDIR)$(htmldir) # cp -a $(srcdir)/html/devel $(DESTDIR)$(htmldir) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org