Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2013-08-27 21:14:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2013-08-07 20:45:48.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2013-08-27 21:56:03.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Aug 9 06:36:31 UTC 2013 - [email protected]
+
+- bnc#798620
+ - removed proposed hotfix for the bug. The hotfix could block
+ starting firewall under some circunstances.
+ - (re)starting firewall is handled in yast2.rpm since 3.0.2
+- 3.0.4
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.0.3.tar.bz2
New:
----
yast2-installation-3.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.uMhCrL/_old 2013-08-27 21:56:04.000000000 +0200
+++ /var/tmp/diff_new_pack.uMhCrL/_new 2013-08-27 21:56:04.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.0.3
+Version: 3.0.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -48,7 +48,7 @@
Requires: autoyast2-installation >= 2.17.1
# ProductProfile
-Requires: yast2 >= 3.0.1
+Requires: yast2 >= 3.0.2
# Language::GetLanguageItems and other API
# Language::Set (handles downloading the translation extensions)
++++++ YaST2-Second-Stage.service ++++++
--- /var/tmp/diff_new_pack.uMhCrL/_old 2013-08-27 21:56:04.000000000 +0200
+++ /var/tmp/diff_new_pack.uMhCrL/_new 2013-08-27 21:56:04.000000000 +0200
@@ -7,9 +7,6 @@
[Service]
Type=oneshot
Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
-# firewall will be started by YaST Second Stage
-# ensure current queue doesn't block YaST starting it
-ExecStartPre=-/bin/systemctl stop SuSEfirewall2.service
ExecStartPre=-/usr/bin/plymouth --hide-splash
ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
RemainAfterExit=yes
++++++ yast2-installation-3.0.3.tar.bz2 -> yast2-installation-3.0.4.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.3/Makefile.am.common
new/yast2-installation-3.0.4/Makefile.am.common
--- old/yast2-installation-3.0.3/Makefile.am.common 2013-08-07
17:25:39.000000000 +0200
+++ new/yast2-installation-3.0.4/Makefile.am.common 2013-08-21
10:27:25.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-installation-3.0.3/VERSION
new/yast2-installation-3.0.4/VERSION
--- old/yast2-installation-3.0.3/VERSION 2013-08-06 13:11:48.000000000
+0200
+++ new/yast2-installation-3.0.4/VERSION 2013-08-21 10:27:19.000000000
+0200
@@ -1 +1 @@
-3.0.3
+3.0.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.3/autodocs-ycp.ami
new/yast2-installation-3.0.4/autodocs-ycp.ami
--- old/yast2-installation-3.0.3/autodocs-ycp.ami 2013-08-07
17:25:39.000000000 +0200
+++ new/yast2-installation-3.0.4/autodocs-ycp.ami 2013-08-21
10:27:25.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-installation-3.0.3/autoyast_desktop/Makefile.in
new/yast2-installation-3.0.4/autoyast_desktop/Makefile.in
--- old/yast2-installation-3.0.3/autoyast_desktop/Makefile.in 2013-08-07
17:25:44.000000000 +0200
+++ new/yast2-installation-3.0.4/autoyast_desktop/Makefile.in 2013-08-21
10:27:29.000000000 +0200
@@ -242,7 +242,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
@@ -489,10 +489,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)
@@ -523,8 +524,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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.3/configure
new/yast2-installation-3.0.4/configure
--- old/yast2-installation-3.0.3/configure 2013-08-07 17:25:42.000000000
+0200
+++ new/yast2-installation-3.0.4/configure 2013-08-21 10:27:28.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-installation 3.0.3.
+# Generated by GNU Autoconf 2.69 for yast2-installation 3.0.4.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-installation'
PACKAGE_TARNAME='yast2-installation'
-PACKAGE_VERSION='3.0.3'
-PACKAGE_STRING='yast2-installation 3.0.3'
+PACKAGE_VERSION='3.0.4'
+PACKAGE_STRING='yast2-installation 3.0.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -597,6 +597,8 @@
have_xsltproc_FALSE
have_xsltproc_TRUE
XSLTPROC
+HAS_YCP_MODULES_FALSE
+HAS_YCP_MODULES_TRUE
YCPC
YCPMAKEDEP
YCPDOC
@@ -1256,7 +1258,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-installation 3.0.3 to adapt to many kinds of
systems.
+\`configure' configures yast2-installation 3.0.4 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1328,7 +1330,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-installation 3.0.3:";;
+ short | recursive ) echo "Configuration of yast2-installation 3.0.4:";;
esac
cat <<\_ACEOF
@@ -1408,7 +1410,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-installation configure 3.0.3
+yast2-installation configure 3.0.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1425,7 +1427,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-installation $as_me 3.0.3, which was
+It was created by yast2-installation $as_me 3.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2364,7 +2366,7 @@
# Define the identity of the package.
PACKAGE='yast2-installation'
- VERSION='3.0.3'
+ VERSION='3.0.4'
cat >>confdefs.h <<_ACEOF
@@ -2487,7 +2489,7 @@
-VERSION="3.0.3"
+VERSION="3.0.4"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <[email protected]>"
@@ -2851,6 +2853,29 @@
fi
+# handle .dep files in Makefile.am.common if any YCP module is present
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for YCP modules" >&5
+$as_echo_n "checking for YCP modules... " >&6; }
+
+# YCP module file name starts with an upper case letter
+find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1
+ if test -n "$has_ycp_modules"; then
+ HAS_YCP_MODULES_TRUE=
+ HAS_YCP_MODULES_FALSE='#'
+else
+ HAS_YCP_MODULES_TRUE='#'
+ HAS_YCP_MODULES_FALSE=
+fi
+
+
+if test -n "$has_ycp_modules"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+fi
+
( cd control;
for xml in `ls *.xml`; do
@@ -3156,6 +3181,10 @@
as_fn_error $? "conditional \"CREATE_PKGCONFIG_NOARCH\" 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
if test -z "${have_xsltproc_TRUE}" && test -z "${have_xsltproc_FALSE}"; then
as_fn_error $? "conditional \"have_xsltproc\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -3557,7 +3586,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-installation $as_me 3.0.3, which was
+This file was extended by yast2-installation $as_me 3.0.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3610,7 +3639,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-installation config.status 3.0.3
+yast2-installation config.status 3.0.4
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-installation-3.0.3/configure.ac
new/yast2-installation-3.0.4/configure.ac
--- old/yast2-installation-3.0.3/configure.ac 2013-08-07 17:25:39.000000000
+0200
+++ new/yast2-installation-3.0.4/configure.ac 2013-08-21 10:27:25.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.ac for yast2-installation
dnl
-dnl -- This file is generated by y2autoconf 3.0.2 - 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-installation, 3.0.3, http://bugs.opensuse.org/,
yast2-installation)
+AC_INIT(yast2-installation, 3.0.4, http://bugs.opensuse.org/,
yast2-installation)
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.3"
+VERSION="3.0.4"
RPMNAME="yast2-installation"
MAINTAINER="Jiří Suchomel <[email protected]>"
@@ -149,6 +149,19 @@
AC_MSG_WARN([yast2-testsuite.rpm is not installed])
])
+# handle .dep files in Makefile.am.common if any YCP module is present
+AC_MSG_CHECKING([for YCP modules])
+
+# YCP module file name starts with an upper case letter
+[find . -type f | grep -q "[[:upper:]][^/]*\.ycp$" && has_ycp_modules=1]
+AM_CONDITIONAL([HAS_YCP_MODULES], [test -n "$has_ycp_modules"])
+
+if test -n "$has_ycp_modules"; then
+ AC_MSG_RESULT([found])
+else
+ AC_MSG_RESULT([not found])
+fi
+
( cd control;
for xml in `ls *.xml`; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.3/control/Makefile.in
new/yast2-installation-3.0.4/control/Makefile.in
--- old/yast2-installation-3.0.3/control/Makefile.in 2013-08-07
17:25:44.000000000 +0200
+++ new/yast2-installation-3.0.4/control/Makefile.in 2013-08-21
10:27:29.000000000 +0200
@@ -315,7 +315,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-recursive
@@ -739,10 +739,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)
@@ -773,8 +774,6 @@
fi; \
fi
--include .dep
-
control.rng: control.rnc
trang -I rnc -O rng control.rnc control.rng
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.0.3/control/docs/examples/Makefile.in
new/yast2-installation-3.0.4/control/docs/examples/Makefile.in
--- old/yast2-installation-3.0.3/control/docs/examples/Makefile.in
2013-08-07 17:25:44.000000000 +0200
+++ new/yast2-installation-3.0.4/control/docs/examples/Makefile.in
2013-08-21 10:27:29.000000000 +0200
@@ -240,7 +240,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
@@ -465,10 +465,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)
@@ -499,8 +500,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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.0.3/control/examples/Makefile.in
new/yast2-installation-3.0.4/control/examples/Makefile.in
--- old/yast2-installation-3.0.3/control/examples/Makefile.in 2013-08-07
17:25:44.000000000 +0200
+++ new/yast2-installation-3.0.4/control/examples/Makefile.in 2013-08-21
10:27:30.000000000 +0200
@@ -240,7 +240,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
xml_files = $(wildcard *.xml)
EXTRA_DIST = $(xml_files)
@@ -468,10 +468,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)
@@ -502,8 +503,6 @@
fi; \
fi
--include .dep
-
# checks only those control files that belong to this package
check-local:
xmllint --relaxng ../control.rng --noout $(xml_files)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.3/doc/autodocs/Makefile.in
new/yast2-installation-3.0.4/doc/autodocs/Makefile.in
--- old/yast2-installation-3.0.3/doc/autodocs/Makefile.in 2013-08-07
17:25:44.000000000 +0200
+++ new/yast2-installation-3.0.4/doc/autodocs/Makefile.in 2013-08-21
10:27:30.000000000 +0200
@@ -242,8 +242,11 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
+# 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-installation-3.0.3/doc/features/examples/Makefile.in
new/yast2-installation-3.0.4/doc/features/examples/Makefile.in
--- old/yast2-installation-3.0.3/doc/features/examples/Makefile.in
2013-08-07 17:25:44.000000000 +0200
+++ new/yast2-installation-3.0.4/doc/features/examples/Makefile.in
2013-08-21 10:27:30.000000000 +0200
@@ -240,7 +240,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
@@ -465,10 +465,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)
@@ -499,8 +500,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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-installation-3.0.3/src/Makefile.in
new/yast2-installation-3.0.4/src/Makefile.in
--- old/yast2-installation-3.0.3/src/Makefile.in 2013-08-07
17:25:44.000000000 +0200
+++ new/yast2-installation-3.0.4/src/Makefile.in 2013-08-21
10:27:30.000000000 +0200
@@ -346,7 +346,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
@@ -730,10 +730,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)
@@ -764,8 +765,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]
