Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2013-08-23 11:06:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2013-08-05 20:55:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2013-08-23 11:06:25.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 6 19:50:43 UTC 2013 - [email protected] + +- removed obsolete BuildRequires: yast2 and yast2-core +- 3.0.2 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.0.1.tar.bz2 New: ---- yast2-bootloader-3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.GZ4JFs/_old 2013-08-23 11:06:26.000000000 +0200 +++ /var/tmp/diff_new_pack.GZ4JFs/_new 2013-08-23 11:06:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.0.1 +Version: 3.0.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -36,8 +36,6 @@ Requires: yast2-packager >= 2.17.24 Requires: yast2-pkg-bindings >= 2.17.25 Requires: yast2-storage >= 2.18.18 -BuildRequires: yast2 >= 2.18.14 -BuildRequires: yast2-core >= 2.18.6 %ifarch %ix86 x86_64 Requires: syslinux @@ -122,19 +120,30 @@ # menu items %ifnarch s390 s390x +%dir %{_prefix}/share/applications/YaST2 %{_prefix}/share/applications/YaST2/bootloader.desktop %endif +%dir /usr/share/YaST2/include %dir /usr/share/YaST2/include/bootloader /usr/share/YaST2/include/bootloader/* +%dir /usr/share/YaST2/modules /usr/share/YaST2/modules/* +%dir /usr/share/YaST2/clients /usr/share/YaST2/clients/bootloader*.rb /usr/share/YaST2/clients/print-product.rb /usr/share/YaST2/clients/inst_*.rb +%dir %{_prefix}/lib/YaST2/bin %{_prefix}/lib/YaST2/bin/* +%dir /usr/lib/YaST2/servers_non_y2 /usr/lib/YaST2/servers_non_y2/ag_* +%dir /usr/share/YaST2/scrconf /usr/share/YaST2/scrconf/*.scr +%dir /var/adm/fillup-templates /var/adm/fillup-templates/* +%dir /usr/share/YaST2/schema +%dir /usr/share/YaST2/schema/autoyast +%dir /usr/share/YaST2/schema/autoyast/rnc /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %dir %{_prefix}/share/doc/packages/yast2-bootloader ++++++ yast2-bootloader-3.0.1.tar.bz2 -> yast2-bootloader-3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/Makefile.am.common new/yast2-bootloader-3.0.2/Makefile.am.common --- old/yast2-bootloader-3.0.1/Makefile.am.common 2013-08-02 21:36:55.000000000 +0200 +++ new/yast2-bootloader-3.0.2/Makefile.am.common 2013-08-13 15:55:57.000000000 +0200 @@ -15,6 +15,7 @@ CLEANFILES = ${ybcfiles} DISTCLEANFILES = .dep +if HAS_YCP_MODULES # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. @@ -26,6 +27,8 @@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} cat ${NEWDEP} > .dep rm ${NEWDEP} +-include .dep +endif dist-hook: check-syntax @@ -58,4 +61,3 @@ fi; \ fi --include .dep diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/Makefile.in new/yast2-bootloader-3.0.2/Makefile.in --- old/yast2-bootloader-3.0.1/Makefile.in 2013-08-02 21:37:00.000000000 +0200 +++ new/yast2-bootloader-3.0.2/Makefile.in 2013-08-13 15:56:01.000000000 +0200 @@ -219,9 +219,6 @@ VERSION = $(shell cat $(srcdir)/VERSION) XGETTEXT = @XGETTEXT@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ -YCPC = @YCPC@ -YCPDOC = @YCPDOC@ -YCPMAKEDEP = @YCPMAKEDEP@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/VERSION new/yast2-bootloader-3.0.2/VERSION --- old/yast2-bootloader-3.0.1/VERSION 2013-08-02 09:41:46.000000000 +0200 +++ new/yast2-bootloader-3.0.2/VERSION 2013-08-13 13:29:58.000000000 +0200 @@ -1 +1 @@ -3.0.1 +3.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/autodocs-ycp.ami new/yast2-bootloader-3.0.2/autodocs-ycp.ami --- old/yast2-bootloader-3.0.1/autodocs-ycp.ami 2013-08-02 21:36:55.000000000 +0200 +++ new/yast2-bootloader-3.0.2/autodocs-ycp.ami 2013-08-13 15:55:57.000000000 +0200 @@ -17,8 +17,11 @@ htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/configure new/yast2-bootloader-3.0.2/configure --- old/yast2-bootloader-3.0.1/configure 2013-08-02 21:36:59.000000000 +0200 +++ new/yast2-bootloader-3.0.2/configure 2013-08-13 15:56:01.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for yast2-bootloader 3.0.1. +# Generated by GNU Autoconf 2.69 for yast2-bootloader 3.0.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='yast2-bootloader' PACKAGE_TARNAME='yast2-bootloader' -PACKAGE_VERSION='3.0.1' -PACKAGE_STRING='yast2-bootloader 3.0.1' +PACKAGE_VERSION='3.0.2' +PACKAGE_STRING='yast2-bootloader 3.0.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -588,6 +588,8 @@ ac_default_prefix=/usr ac_subst_vars='LTLIBOBJS LIBOBJS +HAS_YCP_MODULES_FALSE +HAS_YCP_MODULES_TRUE S390_FALSE S390_TRUE I386_OR_AMD64_FALSE @@ -598,9 +600,6 @@ I386_TRUE SPARC_FALSE SPARC_TRUE -YCPC -YCPMAKEDEP -YCPDOC STYLESHEET_YCPDOC STYLESHEET_YDOC STYLESHEET_CSS @@ -1262,7 +1261,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-bootloader 3.0.1 to adapt to many kinds of systems. +\`configure' configures yast2-bootloader 3.0.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1334,7 +1333,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-bootloader 3.0.1:";; + short | recursive ) echo "Configuration of yast2-bootloader 3.0.2:";; esac cat <<\_ACEOF @@ -1421,7 +1420,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-bootloader configure 3.0.1 +yast2-bootloader configure 3.0.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1438,7 +1437,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-bootloader $as_me 3.0.1, which was +It was created by yast2-bootloader $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2377,7 +2376,7 @@ # Define the identity of the package. PACKAGE='yast2-bootloader' - VERSION='3.0.1' + VERSION='3.0.2' cat >>confdefs.h <<_ACEOF @@ -2500,7 +2499,7 @@ -VERSION="3.0.1" +VERSION="3.0.2" RPMNAME="yast2-bootloader" MAINTAINER="Steffen Winterfeldt <[email protected]>" @@ -2741,168 +2740,6 @@ -# Extract the first word of "ycpdoc", so it can be a program name with args. -set dummy ycpdoc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_YCPDOC+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $YCPDOC in - [\\/]* | ?:[\\/]*) - ac_cv_path_YCPDOC="$YCPDOC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:$devtools_ybindir" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_YCPDOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_YCPDOC" && ac_cv_path_YCPDOC="false" - ;; -esac -fi -YCPDOC=$ac_cv_path_YCPDOC -if test -n "$YCPDOC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YCPDOC" >&5 -$as_echo "$YCPDOC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$YCPDOC" = "false"; then - as_fn_error $? "ycpdoc is not installed" "$LINENO" 5 -fi -# Extract the first word of "ycpmakedep", so it can be a program name with args. -set dummy ycpmakedep; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_YCPMAKEDEP+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $YCPMAKEDEP in - [\\/]* | ?:[\\/]*) - ac_cv_path_YCPMAKEDEP="$YCPMAKEDEP" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:$devtools_ybindir" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_YCPMAKEDEP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_YCPMAKEDEP" && ac_cv_path_YCPMAKEDEP="false" - ;; -esac -fi -YCPMAKEDEP=$ac_cv_path_YCPMAKEDEP -if test -n "$YCPMAKEDEP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YCPMAKEDEP" >&5 -$as_echo "$YCPMAKEDEP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$YCPMAKEDEP" = "false"; then - as_fn_error $? "ycpmakedep is not installed" "$LINENO" 5 -fi -# Extract the first word of "ycpc", so it can be a program name with args. -set dummy ycpc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_YCPC+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $YCPC in - [\\/]* | ?:[\\/]*) - ac_cv_path_YCPC="$YCPC" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:$bindir" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_YCPC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_YCPC" && ac_cv_path_YCPC="false" - ;; -esac -fi -YCPC=$ac_cv_path_YCPC -if test -n "$YCPC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YCPC" >&5 -$as_echo "$YCPC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test "$YCPC" = "false"; then - as_fn_error $? "ycpc is not installed" "$LINENO" 5 -fi -as_ac_File=`$as_echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5 -$as_echo_n "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... " >&6; } -if eval \${$as_ac_File+:} false; then : - $as_echo_n "(cached) " >&6 -else - test "$cross_compiling" = yes && - as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then - eval "$as_ac_File=yes" -else - eval "$as_ac_File=no" -fi -fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_File"\" = x"yes"; then : - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: yast2-testsuite.rpm is not installed" >&5 -$as_echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;} - -fi - - if test $target_cpu = "sparc" -o $target_cpu = "sparc64"; then SPARC_TRUE= @@ -2954,6 +2791,18 @@ fi +# this module does not have any YCP modules +# (defined explicitly here as using (@)YAST2-CHECKS-YCP(@) would add yast2-core +# build dependency back) + if false; then + HAS_YCP_MODULES_TRUE= + HAS_YCP_MODULES_FALSE='#' +else + HAS_YCP_MODULES_TRUE='#' + HAS_YCP_MODULES_FALSE= +fi + + ac_config_files="$ac_config_files Makefile src/Makefile scripts/Makefile doc/autodocs/Makefile doc/Makefile" cat >confcache <<\_ACEOF @@ -3138,6 +2987,10 @@ as_fn_error $? "conditional \"S390\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAS_YCP_MODULES_TRUE}" && test -z "${HAS_YCP_MODULES_FALSE}"; then + as_fn_error $? "conditional \"HAS_YCP_MODULES\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -3535,7 +3388,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-bootloader $as_me 3.0.1, which was +This file was extended by yast2-bootloader $as_me 3.0.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3588,7 +3441,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-bootloader config.status 3.0.1 +yast2-bootloader config.status 3.0.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/configure.ac new/yast2-bootloader-3.0.2/configure.ac --- old/yast2-bootloader-3.0.1/configure.ac 2013-08-02 21:36:55.000000000 +0200 +++ new/yast2-bootloader-3.0.2/configure.ac 2013-08-13 15:55:57.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.ac for yast2-bootloader dnl -dnl -- This file is generated by y2autoconf 3.0.1 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) -AC_INIT(yast2-bootloader, 3.0.1, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 3.0.2, http://bugs.opensuse.org/, yast2-bootloader) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="3.0.1" +VERSION="3.0.2" RPMNAME="yast2-bootloader" MAINTAINER="Steffen Winterfeldt <[email protected]>" @@ -136,22 +136,6 @@ AC_SUBST(STYLESHEET_YCPDOC) -AC_PATH_PROG(YCPDOC, ycpdoc, false, $PATH:$devtools_ybindir) -if test "$YCPDOC" = "false"; then - AC_MSG_ERROR([ycpdoc is not installed]) -fi -AC_PATH_PROG(YCPMAKEDEP, ycpmakedep, false, $PATH:$devtools_ybindir) -if test "$YCPMAKEDEP" = "false"; then - AC_MSG_ERROR([ycpmakedep is not installed]) -fi -AC_PATH_PROG(YCPC, ycpc, false, $PATH:$bindir) -if test "$YCPC" = "false"; then - AC_MSG_ERROR([ycpc is not installed]) -fi -AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ - AC_MSG_WARN([yast2-testsuite.rpm is not installed]) -]) - AM_CONDITIONAL(SPARC, test $target_cpu = "sparc" -o $target_cpu = "sparc64") @@ -168,6 +152,11 @@ AM_CONDITIONAL(I386_OR_AMD64, test "$MBR_I386_TMP" = true) AM_CONDITIONAL(S390, test "$target_cpu" == "s390x" -o "$target_cpu" == "s390") +# this module does not have any YCP modules +# (defined explicitly here as using (@)YAST2-CHECKS-YCP(@) would add yast2-core +# build dependency back) +AM_CONDITIONAL([HAS_YCP_MODULES], [false]) + AC_CONFIG_FILES(Makefile src/Makefile scripts/Makefile doc/autodocs/Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/configure.in.in new/yast2-bootloader-3.0.2/configure.in.in --- old/yast2-bootloader-3.0.1/configure.in.in 2013-08-02 21:36:45.000000000 +0200 +++ new/yast2-bootloader-3.0.2/configure.in.in 2013-08-13 15:21:46.000000000 +0200 @@ -7,7 +7,6 @@ ## some common checks @YAST2-CHECKS-COMMON@ -@YAST2-CHECKS-YCP@ AM_CONDITIONAL(SPARC, test $target_cpu = "sparc" -o $target_cpu = "sparc64") @@ -24,5 +23,10 @@ AM_CONDITIONAL(I386_OR_AMD64, test "$MBR_I386_TMP" = true) AM_CONDITIONAL(S390, test "$target_cpu" == "s390x" -o "$target_cpu" == "s390") +# this module does not have any YCP modules +# (defined explicitly here as using (@)YAST2-CHECKS-YCP(@) would add yast2-core +# build dependency back) +AM_CONDITIONAL([HAS_YCP_MODULES], [false]) + ## and generate the output... @YAST2-OUTPUT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/doc/Makefile.in new/yast2-bootloader-3.0.2/doc/Makefile.in --- old/yast2-bootloader-3.0.1/doc/Makefile.in 2013-08-02 21:37:00.000000000 +0200 +++ new/yast2-bootloader-3.0.2/doc/Makefile.in 2013-08-13 15:56:01.000000000 +0200 @@ -162,9 +162,6 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ -YCPC = @YCPC@ -YCPDOC = @YCPDOC@ -YCPMAKEDEP = @YCPMAKEDEP@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/doc/autodocs/Makefile.in new/yast2-bootloader-3.0.2/doc/autodocs/Makefile.in --- old/yast2-bootloader-3.0.1/doc/autodocs/Makefile.in 2013-08-02 21:37:00.000000000 +0200 +++ new/yast2-bootloader-3.0.2/doc/autodocs/Makefile.in 2013-08-13 15:56:02.000000000 +0200 @@ -168,9 +168,6 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ -YCPC = @YCPC@ -YCPDOC = @YCPDOC@ -YCPMAKEDEP = @YCPMAKEDEP@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -243,8 +240,11 @@ ystartupdir = @ystartupdir@ AUTODOCS_PM = $(top_srcdir)/src/*/*.pm +# find all files in Yast/ subdirectory if it exists +YARD_YAST_FILES = $(shell test -d Yast && find Yast -type f) + # use nobase_ prefix to keep the directory structure -nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(wildcard Yast/*) +nobase_html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) $(wildcard js/*) $(wildcard css/*) $(YARD_YAST_FILES) CLEANFILES = $(nobase_html_DATA) pod2htm*.tmp all: all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/scripts/Makefile.in new/yast2-bootloader-3.0.2/scripts/Makefile.in --- old/yast2-bootloader-3.0.1/scripts/Makefile.in 2013-08-02 21:37:00.000000000 +0200 +++ new/yast2-bootloader-3.0.2/scripts/Makefile.in 2013-08-13 15:56:02.000000000 +0200 @@ -152,9 +152,6 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ -YCPC = @YCPC@ -YCPDOC = @YCPDOC@ -YCPMAKEDEP = @YCPMAKEDEP@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.0.1/src/Makefile.in new/yast2-bootloader-3.0.2/src/Makefile.in --- old/yast2-bootloader-3.0.1/src/Makefile.in 2013-08-02 21:37:00.000000000 +0200 +++ new/yast2-bootloader-3.0.2/src/Makefile.in 2013-08-13 15:56:02.000000000 +0200 @@ -165,9 +165,6 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ -YCPC = @YCPC@ -YCPDOC = @YCPDOC@ -YCPMAKEDEP = @YCPMAKEDEP@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -343,7 +340,7 @@ # Needs to be outside "." because of cases # where ycpchook contains a symlink to "." # Otherwise "." keeps being newer than .dep and we loop. -NEWDEP = ${top_builddir}/.dep.new +@HAS_YCP_MODULES_TRUE@NEWDEP = ${top_builddir}/.dep.new CHECK_SYNTAX = true all: all-am @@ -878,10 +875,11 @@ # generate dependencies # two steps not to lose the file if the command fails # hook: create the links before we look for files -.dep: $(wildcard *.ycp) ${ycpchook} - ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} - cat ${NEWDEP} > .dep - rm ${NEWDEP} +@[email protected]: $(wildcard *.ycp) ${ycpchook} +@HAS_YCP_MODULES_TRUE@ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP} +@HAS_YCP_MODULES_TRUE@ cat ${NEWDEP} > .dep +@HAS_YCP_MODULES_TRUE@ rm ${NEWDEP} +@HAS_YCP_MODULES_TRUE@-include .dep dist-hook: check-syntax check-syntax: $(client_DATA) $(module_DATA) $(ynclude_DATA) $(ydata_DATA) $(ycpchook) $(ybcfiles) @@ -912,8 +910,6 @@ fi; \ fi --include .dep - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
