Tue Dec 9 22:26:17 2003 Michael Jennings (mej)
Add libast libs to GRLIBS. Hopefully fixed Etbg_update_list to be Solaris /bin/sh-friendly. SVN revision: 8077
This commit is contained in:
parent
06f3d6a920
commit
200ba29a4c
|
@ -5130,3 +5130,9 @@ Fri Nov 28 09:04:49 2003 Michael Jennings (mej)
|
||||||
|
|
||||||
Changes for compatibility with newer LibAST.
|
Changes for compatibility with newer LibAST.
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
|
Tue Dec 9 22:26:17 2003 Michael Jennings (mej)
|
||||||
|
|
||||||
|
Add libast libs to GRLIBS.
|
||||||
|
|
||||||
|
Hopefully fixed Etbg_update_list to be Solaris /bin/sh-friendly.
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
Summary: Enlightened terminal emulator
|
Summary: Enlightened terminal emulator
|
||||||
Name: Eterm
|
Name: Eterm
|
||||||
Version: 0.9.2
|
Version: 0.9.2
|
||||||
Release: 4
|
Release: 5
|
||||||
Copyright: BSD
|
Copyright: BSD
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
Requires: imlib2, imlib2-loader_jpeg, imlib2-loader_png
|
Requires: imlib2, imlib2-loader_jpeg, imlib2-loader_png
|
||||||
|
|
|
@ -484,6 +484,7 @@ else
|
||||||
FOUND_LIBAST=`$LIBAST_CONFIG --version | awk -F. '{print $2}'`
|
FOUND_LIBAST=`$LIBAST_CONFIG --version | awk -F. '{print $2}'`
|
||||||
CPPFLAGS="$CPPFLAGS `$LIBAST_CONFIG --cppflags`"
|
CPPFLAGS="$CPPFLAGS `$LIBAST_CONFIG --cppflags`"
|
||||||
LDFLAGS="$LDFLAGS `$LIBAST_CONFIG --ldflags`"
|
LDFLAGS="$LDFLAGS `$LIBAST_CONFIG --ldflags`"
|
||||||
|
GRLIBS="$GRLIBS `$LIBAST_CONFIG --libs`"
|
||||||
fi
|
fi
|
||||||
AC_CHECK_LIB(ast, libast_set_program_name, , FOUND_LIBAST=0, $GRLIBS)
|
AC_CHECK_LIB(ast, libast_set_program_name, , FOUND_LIBAST=0, $GRLIBS)
|
||||||
|
|
||||||
|
|
|
@ -17,18 +17,18 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "x$1" = "x-h" -o "x$1" = "x--help" ]; then
|
if [ "x$1" = "x-h" -o "x$1" = "x--help" ]; then
|
||||||
echo "Syntax: Etbg_update_list [path]"
|
echo "Syntax: Etbg_update_list [path]"
|
||||||
echo " (The default path is the current directory.)"
|
echo " (The default path is the current directory.)"
|
||||||
echo
|
echo
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Find the pixmap directory
|
# Find the pixmap directory
|
||||||
for i in "$1" "$PWD" "$PWD/pix" "$PWD/../pix" ; do
|
for i in "$1" "$PWD" "$PWD/pix" "$PWD/../pix" ; do
|
||||||
if [ -d "$i/tile" -o -d "$i/scale" ]; then
|
if [ -d "$i/tile" -o -d "$i/scale" ]; then
|
||||||
PIXDIR="$i"
|
PIXDIR="$i"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
cd $PIXDIR
|
cd $PIXDIR
|
||||||
|
@ -48,13 +48,13 @@ begin menu
|
||||||
title Tiled
|
title Tiled
|
||||||
EOF
|
EOF
|
||||||
if [ -d tile ]; then
|
if [ -d tile ]; then
|
||||||
for i in `(cd tile && ls -1)` ; do
|
for i in `(cd tile && ls -1)` ; do
|
||||||
echo '"tile/'$i'@0x0+0+0:tile"' >> $LISTFILE.new
|
echo '"tile/'$i'@0x0+0+0:tile"' >> $LISTFILE.new
|
||||||
echo " begin menuitem" >&3
|
echo " begin menuitem" >&3
|
||||||
eval echo "\ \ \ \ text \\\"\`echo $i | $SEDCMD\`\\\"" >&3
|
eval echo "\ \ \ \ text \\\"\`echo $i | $SEDCMD\`\\\"" >&3
|
||||||
echo " action string \"\\e]20;tile/$i;0x0+0+0:tile\\a\"" >&3
|
echo " action string \"\\e]20;tile/$i;0x0+0+0:tile\\a\"" >&3
|
||||||
echo " end" >&3
|
echo " end" >&3
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
cat >&3 <<EOF
|
cat >&3 <<EOF
|
||||||
end
|
end
|
||||||
|
@ -63,40 +63,41 @@ begin menu
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if [ -d scale ]; then
|
if [ -d scale ]; then
|
||||||
for i in `(cd scale && ls -1)` ; do \
|
for i in `(cd scale && ls -1)` ; do \
|
||||||
echo '"scale/'$i'@100x100"' >> $LISTFILE.new ; \
|
echo '"scale/'$i'@100x100"' >> $LISTFILE.new ; \
|
||||||
echo " begin menuitem" >&3
|
echo " begin menuitem" >&3
|
||||||
eval echo "\ \ \ \ text \\\"\`echo $i | $SEDCMD\`\\\"" >&3
|
eval echo "\ \ \ \ text \\\"\`echo $i | $SEDCMD\`\\\"" >&3
|
||||||
echo " action string \"\\e]20;tile/$i;0x0+0+0:tile\\a\"" >&3
|
echo " action string \"\\e]20;tile/$i;0x0+0+0:tile\\a\"" >&3
|
||||||
echo " end" >&3
|
echo " end" >&3
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
echo "end" >&3
|
echo "end" >&3
|
||||||
|
|
||||||
# Check to see if the list has changed. If so, back up the old one.
|
# Check to see if the list has changed. If so, back up the old one.
|
||||||
if [ -s $LISTFILE ]; then
|
if [ -s $LISTFILE ]; then
|
||||||
if (diff $LISTFILE $LISTFILE.new >/dev/null 2>&1); then
|
if (diff $LISTFILE $LISTFILE.new >/dev/null 2>&1); then
|
||||||
echo "Pixmap list is unchanged."
|
echo "Pixmap list is unchanged."
|
||||||
rm -f $LISTFILE.new
|
rm -f $LISTFILE.new
|
||||||
else
|
else
|
||||||
echo "Old pixmap list will be saved in $LISTFILE.old"
|
echo "Old pixmap list will be saved in $LISTFILE.old"
|
||||||
mv -f $LISTFILE $LISTFILE.old
|
mv -f $LISTFILE $LISTFILE.old
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [ -s $LISTFILE.new ]; then
|
if [ -s $LISTFILE.new ]; then
|
||||||
mv -f $LISTFILE.new $LISTFILE
|
mv -f $LISTFILE.new $LISTFILE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If there's no theme directory nearby, just quit.
|
# If there's no theme directory nearby, just quit.
|
||||||
if [ ! -d "../themes" ]; then
|
if [ ! -d "../themes" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If there is, cd into it and make sure all the themes have list files.
|
# If there is, cd into it and make sure all the themes have list files.
|
||||||
cd ../themes
|
cd ../themes
|
||||||
for i in `ls -1` ; do
|
for i in `ls -1` ; do
|
||||||
if [ -f $i/theme.cfg -a ! -e $i/$LISTFILE ]; then
|
if [ -f $i/theme.cfg -a ! -f $i/$LISTFILE ]; then
|
||||||
echo "Creating symlink to $LISTFILE for theme $i"
|
echo "Creating symlink to $LISTFILE for theme $i"
|
||||||
(cd $i && ln -f -s ../../pix/$LISTFILE $LISTFILE)
|
rm -f $i/$LISTFILE
|
||||||
fi
|
ln -f -s ../../pix/$LISTFILE $i/$LISTFILE
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue