Author: mvidner Date: Wed Jul 9 17:09:38 2008 New Revision: 48938 URL: http://svn.opensuse.org/viewcvs/yast?rev=48938&view=rev Log: Fixed building in a prefix (/etc). Modified: trunk/installation/configure.in.in trunk/installation/package/yast2-installation.changes trunk/installation/src/config/Makefile.am Modified: trunk/installation/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/configure.in.in?rev=48938&r1=48937&r2=48938&view=diff ============================================================================== --- trunk/installation/configure.in.in (original) +++ trunk/installation/configure.in.in Wed Jul 9 17:09:38 2008 @@ -23,6 +23,12 @@ AX_CHECK_DOCBOOK +# If we change the default here instead of in Makefile.am +# then it can be overriden at configure time +if test "${sysconfdir}" = '${prefix}/etc'; then + sysconfdir=/etc +fi + AC_MSG_CHECKING([fvwm directory]) coresysconfdir=`pkg-config --print-errors --variable=sysconfdir yast2-core` if test -z "$coresysconfdir"; then Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=48938&r1=48937&r2=48938&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Jul 9 17:09:38 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 9 17:09:15 CEST 2008 - mvidner@suse.cz + +- Fixed building in a prefix (/etc). + +------------------------------------------------------------------- Wed Jul 9 15:12:53 CEST 2008 - locilka@suse.cz - Initializing the 'use_automatic_configuration' in first-stage Modified: trunk/installation/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/config/Makefile.am?rev=48938&r1=48937&r2=48938&view=diff ============================================================================== --- trunk/installation/src/config/Makefile.am (original) +++ trunk/installation/src/config/Makefile.am Wed Jul 9 17:09:38 2008 @@ -3,7 +3,7 @@ desktop_DATA = release_notes.desktop # FIXME -icewmdir= /etc/icewm +icewmdir= ${sysconfdir}/icewm icewm_DATA = preferences.yast2 EXTRA_DIST = $(desktop_DATA) $(icewm_DATA) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org