Author: mvidner Date: Tue Jun 9 11:45:04 2009 New Revision: 57509 URL: http://svn.opensuse.org/viewcvs/yast?rev=57509&view=rev Log: Fixed makefiles to work with "install" calls changed via automake-1.11. http://git.savannah.gnu.org/cgit/automake.git/tree/NEWS?id=65f53cc178cd5876f... Modified: trunk/core/libycp/doc/Makefile.am trunk/core/libycp/doc/ycp/Makefile.am trunk/core/package/yast2-core.changes trunk/core/wfm/doc/Makefile.am Modified: trunk/core/libycp/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/doc/Makefile.am?rev=57509&r1=57508&r2=57509&view=diff ============================================================================== --- trunk/core/libycp/doc/Makefile.am (original) +++ trunk/core/libycp/doc/Makefile.am Tue Jun 9 11:45:04 2009 @@ -10,7 +10,7 @@ xmlfiles = combined.xml # needed for building the overall documentation xmlfilesseparated := $(foreach xml,$(builtinxml),$(notdir $(xml))) -htmlfiles = $(wildcard html/*.html html/*/*.html) +htmlfiles = $(filter-out html/index.html,$(wildcard html/*.html html/*/*.html)) html_DATA = \ Modified: trunk/core/libycp/doc/ycp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libycp/doc/ycp/Makefile.am?rev=57509&r1=57508&r2=57509&view=diff ============================================================================== --- trunk/core/libycp/doc/ycp/Makefile.am (original) +++ trunk/core/libycp/doc/ycp/Makefile.am Tue Jun 9 11:45:04 2009 @@ -15,7 +15,7 @@ html/index.html: ycp.xml customize-html.xsl $(XSLTPROC) $(XSLTPROC_FLAGS) customize-html.xsl ycp.xml -html_DATA = $(wildcard html/*) +html_DATA = $(wildcard html/*.*) EXTRA_DIST = *.xml $(html_DATA) Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?rev=57509&r1=57508&r2=57509&view=diff ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Tue Jun 9 11:45:04 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 9 11:29:35 CEST 2009 - mvidner@suse.cz + +- Fixed makefiles to work with "install" calls changed via + automake-1.11. + +------------------------------------------------------------------- Mon Jun 1 08:54:18 CEST 2009 - mvidner@suse.cz - Fixed char* constness for glibc-2.10. Modified: trunk/core/wfm/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/wfm/doc/Makefile.am?rev=57509&r1=57508&r2=57509&view=diff ============================================================================== --- trunk/core/wfm/doc/Makefile.am (original) +++ trunk/core/wfm/doc/Makefile.am Tue Jun 9 11:45:04 2009 @@ -4,7 +4,7 @@ htmldir = $(yastdocdir)/ycp/WFM -htmlfiles = $(wildcard html/*.html) +htmlfiles = $(filter-out html/index.html,$(wildcard html/*.html)) builtin = $(srcdir)/../src/Y2WFMComponent.cc builtinxml := $(builtin:%.cc=%.xml) xmlfiles := $(foreach xml,$(builtinxml),$(notdir $(xml))) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org