Author: fs Date: Fri Nov 25 16:45:13 2011 New Revision: 66958 URL: http://svn.opensuse.org/viewcvs/yast?rev=66958&view=rev Log: Basic makefile functionality is there, still needs some work: PHONY targets for html and pdf need to be replaced by implicit targets; install-local needs fixing; check whether make -i package-local creates usable stuff and whether the spec-file template needs to be adjusted Modified: trunk/autoinstallation/doc/Makefile.am trunk/autoinstallation/doc/xml/Makefile.am Modified: trunk/autoinstallation/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Makefile.am?rev=66958&r1=66957&r2=66958&view=diff ============================================================================== --- trunk/autoinstallation/doc/Makefile.am (original) +++ trunk/autoinstallation/doc/Makefile.am Fri Nov 25 16:45:13 2011 @@ -4,21 +4,28 @@ # $Id$ # -SUBDIRS = xml autodocs entities bin components examples xsl -htmldir = $(docdir)/html +#SUBDIRS = xml +#htmldir = $(docdir)/html +html_DATA = html +doc_DATA = pdf -pdf: xml/ay_bigfile.xml - daps -e ENV-autoyast pdf-color -html: xml/ay_bigfile.xml - daps -e ENV-autoyast html +html: + $(MAKE) -C xml html -pkgsrc: xml/ay_bigfile.xml - daps -e ENV-autoyast package-src +pdf: + $(MAKE) -C xml pdf -html-debug: xml/ay_bigfile.xml - daps --debug -e ENV-autoyast html +pkgsrc: + $(MAKE) -C xml pkgsrc -xml/ay_bigfile.xml: - cd xml; make ay_bigfile.xml +html-debug: + $(MAKE) -C xml pkgsrc + +bigfile: + $(MAKE) -C xml ay_bigfile.xml + +clean: + $(MAKE) -C xml clean + rm -rf build Modified: trunk/autoinstallation/doc/xml/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/xml/Makefile.am?rev=66958&r1=66957&r2=66958&view=diff ============================================================================== --- trunk/autoinstallation/doc/xml/Makefile.am (original) +++ trunk/autoinstallation/doc/xml/Makefile.am Fri Nov 25 16:45:13 2011 @@ -22,11 +22,12 @@ STYLESHEET_CSS = default.css -DAPS_BASE=$(shell readlink -f ..) - html_DATA = html doc_DATA = pdf + +DAPS_BASE := $(shell readlink -f ..) + #html_DATA = $(wildcard html/*.html) \ # html/index.html \ # html/yast2docs.css \ @@ -37,16 +38,18 @@ .PHONY: pdf 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 := $(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 - mv $(RESULTDIR)/* html + cp -a $(RESULTDIR)/* html pdf: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml -pdf: RESULTDIR=$(shell daps -e ENV-autoyast --basedir=$(DAPS_BASE) color-pdf-name 2>/dev/null) +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 pkgsrc: $(xml_files) autoyast.xml prep-daps-images entities ay_bigfile.xml daps -e ENV-autoyast --basedir=$(DAPS_BASE) package-src @@ -101,9 +104,12 @@ xsltproc --output $@ \ /usr/share/susedoc/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: install -d -m 755 $(DESTDIR)$(htmldir) cp -a $(srcdir)/html/* $(DESTDIR)$(htmldir) + 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