Author: keichwa Date: 2015-11-10 13:14:48 +0100 (Tue, 10 Nov 2015) New Revision: 94733 Modified: trunk/yast/50-tools/y2-prep-packages.sh Log: Summary: sync with branches/SLE12-SP1 Modified: trunk/yast/50-tools/y2-prep-packages.sh =================================================================== --- trunk/yast/50-tools/y2-prep-packages.sh 2015-11-10 09:09:55 UTC (rev 94732) +++ trunk/yast/50-tools/y2-prep-packages.sh 2015-11-10 12:14:48 UTC (rev 94733) @@ -8,8 +8,6 @@ # Note the quotes around `$TEMP': they are essential! eval set -- "$TEMP" -# set -x - while true ; do case "$1" in -h|--help) echo "$usage"; exit ;; @@ -49,7 +47,7 @@ cvs=${cvs-svn} #msg=${msg-Update} -stage1= +stage1=yes checkin_mail=.checkin-mail [ -f $checkin_mail ] && mv $checkin_mail $checkin_mail.bak @@ -71,10 +69,16 @@ # done do_prep () { - [ -z "$stage1" ] || make -f Makefile.cvs - cp ../de/Makefile.am . - cp ../de/po/Makefile.am po + # [ -z "$stage1" ] || make -f Makefile.cvs + # cp ../de/Makefile.am . + # cp ../de/COPYING . + # cp ../de/README . + # cp ../de/po/Makefile.am po + # sed "s/-de/-${l}/g;s/^\(ACINIT.*\), ,/\1, 3.0.0,/" \ + # ../de/configure.ac >configure.ac # y2tool y2autoconf + autoreconf --force --install + ./configure make pushd po >/dev/null rm -f .error-flag