Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
setup-gettext.sh
Log Message:
An attempt to work around a problem with gettext-0.12.1 and make install.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/setup-gettext.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- setup-gettext.sh 2 Apr 2003 22:50:54 -0000 1.1
+++ setup-gettext.sh 5 Feb 2004 22:14:08 -0000 1.2
@@ -171,32 +171,36 @@
fi
# Okay, run the main stuff
-if [ "$GETTEXT_TOOL" = "autopoint" ]; then
+if [ $GETTEXT_MINOR_VERSION -eq 12 ]; then
+ [ $VERBOSE -eq 1 ] && echo " autopoint --force"
+ cp configure.in .tmp-configure.in
+ sed -e
"s/^AM_GNU_GETTEXT_VERSION(.*)/AM_GNU_GETTEXT_VERSION($GETTEXT_VERSION)/" <
.tmp-configure.in > configure.in
+ autopoint --force || abort
+ mv .tmp-configure.in configure.in
+elif [ "$GETTEXT_TOOL" = "autopoint" ]; then
backup_m4
[ $VERBOSE -eq 1 ] && echo " autopoint --force"
echo n | autopoint --force || abort
restore_m4
-else
- if [ $GETTEXT_MINOR_VERSION -eq 11 ]; then
- backup_m4
+elif [ $GETTEXT_MINOR_VERSION -eq 11 ]; then
+ backup_m4
- # Gettext is pure evil. It DEMANDS that we press Return no matter
- # what. This gets rid of their happy "feature" of doom.
- [ $VERBOSE -eq 1 ] && \
- echo " gettextize --copy --force --intl --no-changelog"
+ # Gettext is pure evil. It DEMANDS that we press Return no matter
+ # what. This gets rid of their happy "feature" of doom.
+ [ $VERBOSE -eq 1 ] && \
+ echo " gettextize --copy --force --intl --no-changelog"
- sed 's:read .*< /dev/tty::' `which gettextize` > .temp-gettextize
- chmod +x .temp-gettextize
- echo n | ./.temp-gettextize --copy --force --intl --no-changelog ||
abort
- rm .temp-gettextize
+ sed 's:read .*< /dev/tty::' `which gettextize` > .temp-gettextize
+ chmod +x .temp-gettextize
+ echo n | ./.temp-gettextize --copy --force --intl --no-changelog || abort
+ rm .temp-gettextize
- restore_files
- restore_m4
+ restore_files
+ restore_m4
- [ -f po/Makevars.template ] && mv po/Makevars.template po/Makevars
- else
- [ $VERBOSE -eq 1 ] && echo " gettextize --copy --force"
- echo n | gettextize --copy --force || exit;
- fi
+ [ -f po/Makevars.template ] && mv po/Makevars.template po/Makevars
+else
+ [ $VERBOSE -eq 1 ] && echo " gettextize --copy --force"
+ echo n | gettextize --copy --force || exit;
fi
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
