diff -ru AfterStep-2.2.8/afterstep/base.in AfterStep-2.2.8.fix/afterstep/base.in --- AfterStep-2.2.8/afterstep/base.in 2007-10-25 20:39:13 +0300 +++ AfterStep-2.2.8.fix/afterstep/base.in 2008-10-06 09:21:00 +0300 @@ -9,9 +9,9 @@ # Directories # ModulePath @bindir@ -IconPath @x_includes@/X11/bitmaps/ -FontPath @with_afterdir@/desktop/fonts/:@datadir@/afterstep/desktop/fonts/:/usr/share/fonts/default/TrueType/:/usr/share/fonts/truetype/freefont/:@x_libraries@/X11/fonts/TTF -PixmapPath @with_afterdir@/desktop/icons/:@datadir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:@datadir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:@datadir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:@datadir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/:/usr/share/pixmaps/:/usr/share/icons/hicolor/48x48/apps/ +IconPath @x_includes@/X11/bitmaps/:/usr/share/icons/:/usr/share/icons/mini/:/usr/share/icons/large +FontPath ~./fonts:@with_afterdir@/desktop/fonts/:@datadir@/afterstep/desktop/fonts/:/usr/share/fonts/default/TrueType/:@x_libraries@/X11/fonts/TTF +PixmapPath @with_afterdir@/desktop/icons/:@datadir@/afterstep/desktop/icons/:@with_afterdir@/desktop/:@datadir@/afterstep/desktop/:@with_afterdir@/desktop/buttons/:@datadir@/afterstep/desktop/buttons/:@with_afterdir@/backgrounds/:@datadir@/afterstep/backgrounds/:@x_includes@/X11/pixmaps/:/usr/share/pixmaps CursorPath @with_afterdir@/desktop/cursors:@datadir@/afterstep/desktop/cursors *ScriptPath @with_afterdir@/scripts/:@datadir@/afterstep/scripts/ # Только в AfterStep-2.2.8.fix/afterstep: base.in~ diff -ru AfterStep-2.2.8/afterstep/database AfterStep-2.2.8.fix/afterstep/database --- AfterStep-2.2.8/afterstep/database 2007-07-22 05:29:55 +0300 +++ AfterStep-2.2.8.fix/afterstep/database 2008-10-06 09:25:08 +0300 @@ -64,9 +64,8 @@ Style "wmsystray" AvoidCover, StartIconic, NoTitle, Layer 4,NoHandles # Web browsers -Style "Mozilla-bin" Icon logos/mozilla, IgnoreConfig -# , StartsOnDesk 1 -Style "Firefox-bin" Icon logos/Firefox, IgnoreConfig +Style "Firefox" Icon logos/Firefox, IgnoreConfig, StartsOnDesk 1 +Style "Mozilla" Icon logos/mozilla, IgnoreConfig, StartsOnDesk 1 # this will prevent firefox's download manager from poping on top every time: Style "*Downloads" Icon logos/Package, IgnoreRestack # , StartsOnDesk 1 @@ -76,7 +75,7 @@ # , StartsOnDesk 1 # Email apps -#Style "Thunderbird-bin" StartsOnDesk 2 +Style "Thunderbird" StartsOnDesk 2, StartsOnDesk 2 Style "evolution" IgnoreConfig #, StartsOnDesk 2 Только в AfterStep-2.2.8.fix/afterstep: database~ diff -ru AfterStep-2.2.8/afterstep/wharf AfterStep-2.2.8.fix/afterstep/wharf --- AfterStep-2.2.8/afterstep/wharf 2008-02-13 07:29:04 +0200 +++ AfterStep-2.2.8.fix/afterstep/wharf 2008-10-06 09:28:27 +0300 @@ -117,9 +117,8 @@ # # First available GUI Web Browser : # -*Wharf WebBrowser normal/WWW Exec x-www-browser & *Wharf WebBrowser logos/Firefox Exec "Firefox" firefox & -*Wharf WebBrowser logos/Firefox Exec "Firefox2" mozilla-firefox & +*Wharf WebBrowser normal/WWW Exec x-www-browser & *Wharf WebBrowser logos/mozilla Exec "Mozilla" mozilla & *Wharf WebBrowser logos/Opera Exec "Opera Web Browser" opera & *Wharf WebBrowser normal/WWW Exec sensible-browser & @@ -127,10 +126,10 @@ # # First available GUI e-mail client : # -*Wharf Mail logos/Thunderbird Exec "Thunderbird" thunderbird & -*Wharf Mail logos/Thunderbird Exec "Thunderbird2" mozilla-thunderbird & +*Wharf Mail normal/MailBox2 Exec "Thunderbird" thunderbird & *Wharf Mail normal/MailBox2 Exec "mozilla-mail" mozilla --mail & *Wharf Mail normal/MailBox2 Exec "kmail" kmail & +*Wharf Mail normal/MailBox2 Exec "Mutt" xterm -fg yellow -bg blue -e mutt & *Wharf Mail normal/MailBox2 Exec "balsa" balsa & *Wharf Mail normal/MailBox2 ExecInTerm "Pine" -title "Pine e-mail and news reader" -e pine & @@ -138,12 +137,14 @@ # # First available GUI image editor : # -*Wharf ImageEditor logos/gimp Exec "GIMP" gimp & -*Wharf ImageEditor normal/XV Exec "XV" xv & +*Wharf ImageEditor normal/gimp Exec "OpenOffice.org Draw" oodraw & +*Wharf ImageEditor logos/gimp Exec "GIMP" gimp & +*Wharf ImageEditor normal/XV Exec "XV" xv & # # First available GUI text editor : # +*Wharf TextEditor Text.xpm Exec "Gedit" gedit & *Wharf TextEditor Text.xpm Exec "NEdit" nedit & *Wharf TextEditor Text.xpm Exec "cooledit" cooledit --look next & *Wharf TextEditor logos/GNU Exec "XEmacs" xemacs & @@ -152,6 +153,7 @@ # # First available Word processor : # +*Wharf WordProcessor normal/Document Exec "OpenOffice.org Writer" oowriter & *Wharf WordProcessor normal/Document Exec "AbiWord" abiword & *Wharf WordProcessor normal/Document Exec "KWord" kword & *Wharf WordProcessor normal/Document Exec "Pathetic Writer" pw & @@ -160,6 +162,7 @@ # # First available Spreadsheet processor : # +*Wharf Spreadsheet normal/Table Exec "OpenOffice.org Calc" oocalc & *Wharf Spreadsheet normal/Table Exec "KSpread" kspread & *Wharf Spreadsheet normal/Table Exec "GNUMERIC" gnumeric & *Wharf Spreadsheet normal/Table Exec "Siag" siag & @@ -167,9 +170,14 @@ # # First available IRC client : # -*Wharf IRC normal/IRCTransparent Exec "XCHAT" xchat & -*Wharf IRC normal/IRCTransparent ExecInTerm "BitchX" -title "BitchX IRC" +sb if(aterm){-tr -sh 50 -fg white -bg black} if(Eterm){-O --shade 50 -f white -b black) if(rxvt){-tr -fg white -bg black} if(xterm){-fg white -bg black} -e BitchX irc.freenode.net & - +*Wharf IRC normal/IRCTransparent Exec "XCHAT2" xchat2 & +*Wharf IRC normal/IRCTransparent Exec "XCHAT" xchat & +*Wharf IRC normal/IRCTransparent Exec "Chatzilla" firefox -chat & +*Wharf IRC normal/IRCTransparent Exec "Chatzilla" mozilla -chat & +*Wharf IRC normal/IRCTransparent Exec "BitchX" aterm +sb -title "BitchX IRC" -tr -sh 50 -fg white -bg black -e BitchX irc.freenode.net & +*Wharf IRC normal/IRCTransparent Exec "BitchX" rxvt +sb -title "BitchX IRC" -tr -fg yellow -bg black -e BitchX irc.freenode.net & +*Wharf IRC normal/IRCTransparent Exec "BitchX" eterm +sb -title "BitchX IRC" -tr -sh 50 -fg yellow -bg black -e BitchX irc.freenode.net & +*Wharf IRC normal/IRCTransparent Exec "BitchX" xterm -fg yellow -bg blue -e BitchX irc.freenode.net & # subfolder full of games : *Wharf Games - Category "Games" @@ -191,8 +199,8 @@ # # First available Video player : # - - +*Wharf VideoPlayer normal/MovieProjector Exec "MPlayer" gmplayer & +*Wharf VideoPlayer normal/MovieProjector Exec "Xine" xine & # Только в AfterStep-2.2.8.fix/afterstep: wharf~ diff -ru AfterStep-2.2.8/autoconf/configure.in AfterStep-2.2.8.fix/autoconf/configure.in --- AfterStep-2.2.8/autoconf/configure.in 2008-03-04 18:18:15 +0200 +++ AfterStep-2.2.8.fix/autoconf/configure.in 2008-10-06 09:13:56 +0300 @@ -87,8 +87,8 @@ AC_ARG_ENABLE(shmimage, [ --enable-shmimage support shared memory images [[yes]] ],enable_shmimage=$enableval,enable_shmimage="yes") AC_ARG_ENABLE(xinerama, [ --enable-xinerama support Xinerama Multihead extentions [[yes]] ],enable_xinerama=$enableval,enable_xinerama="yes") AC_ARG_ENABLE(glx, [ --enable-glx support for OpenGL extention [[yes]] ],enable_glx=$enableval,enable_glx="no") -AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libafterstep statically [[yes]] ],enable_staticlibs=$enableval,enable_staticlibs="yes") -AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libafterstep dynamically [[no]] ],enable_sharedlibs=$enableval,enable_sharedlibs="no") +AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libafterstep statically [[yes]] ],enable_staticlibs=$enableval,enable_staticlibs="no") +AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libafterstep dynamically [[no]] ],enable_sharedlibs=$enableval,enable_sharedlibs="yes") AC_ARG_WITH(readline, [ --with-readline make WinCommand use readline library for interactive mode[[yes]] ], with_readline=$withval,with_readline="") AC_ARG_WITH(libefence, [ --with-libefence compile with libefence to debug buffer overruns [[no]] ],with_libefence=$withval,with_libefence="") @@ -211,8 +211,6 @@ export FIND AC_PATH_PROG(XARGS, xargs, xargs) export XARGS -AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin) -export LDCONFIG dnl# Checks for optional programs AC_PROG_LEX Только в AfterStep-2.2.8.fix/autoconf: configure.in~ diff -ru AfterStep-2.2.8/autoconf/configure.libs.in AfterStep-2.2.8.fix/autoconf/configure.libs.in --- AfterStep-2.2.8/autoconf/configure.libs.in 2005-03-22 18:10:50 +0200 +++ AfterStep-2.2.8.fix/autoconf/configure.libs.in 2008-10-06 09:14:23 +0300 @@ -155,8 +155,6 @@ export FIND AC_PATH_PROG(XARGS, xargs, xargs) export XARGS -AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin) -export LDCONFIG dnl# Checks for optional programs AC_PROG_LEX Только в AfterStep-2.2.8.fix/autoconf: configure.libs.in~ diff -ru AfterStep-2.2.8/autoconf/Makefile.common.lib.in AfterStep-2.2.8.fix/autoconf/Makefile.common.lib.in --- AfterStep-2.2.8/autoconf/Makefile.common.lib.in 2007-04-21 01:10:45 +0300 +++ AfterStep-2.2.8.fix/autoconf/Makefile.common.lib.in 2008-10-06 09:11:25 +0300 @@ -44,23 +44,11 @@ install.script: install.dyn: uninstall.dyn - @( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)"; \ - $(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR); \ - $(LN_S) -f $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR); \ - $(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \ - if test `uname` = "Linux"; then \ - if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \ - echo "" > /dev/null; \ - elif grep -q $(LIBDIR) /etc/ld.so.conf > /dev/null 2>&1; then \ - echo "" > /dev/null; \ - else \ - echo "Unable to find $(LIBDIR) in ld.so.conf. In order to use "; \ - echo "$(LIB_SHARED), you may need to add it or set LD_LIBRARY_PATH."; \ - fi; \ - echo "$(LDCONFIG)"; \ - $(LDCONFIG); \ - fi \ - ) + $(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR) + if test "x$$CONFIG_OBJS" != "x"; then $(INSTALL_SCRIPT) $(CONFIG_OBJS) $(AFTER_BIN_DIR);fi + -@/bin/rm -f $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED) + ln -sf $(LIB_SHARED).$(LIBVER) $(LIBDIR)/$(LIB_SHARED).$(LIBVERMAJOR) + ln -sf $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED) install.cyg: uninstall.cyg @( echo "$(INSTALL_LIB) $(LIB_SHARED_CYG) $(AFTER_BIN_DIR)"; \ Только в AfterStep-2.2.8.fix/autoconf: Makefile.common.lib.in~ diff -ru AfterStep-2.2.8/autoconf/Makefile.defines.in AfterStep-2.2.8.fix/autoconf/Makefile.defines.in --- AfterStep-2.2.8/autoconf/Makefile.defines.in 2008-01-16 23:23:07 +0200 +++ AfterStep-2.2.8.fix/autoconf/Makefile.defines.in 2008-10-06 09:16:01 +0300 @@ -17,7 +17,6 @@ MKDIR = @MKDIR@ FIND = @FIND@ XARGS = @XARGS@ -LDCONFIG = @LDCONFIG@ LN_S = @LN_S@ YACC = @YACC@ Только в AfterStep-2.2.8.fix/autoconf: Makefile.defines.in~ diff -ru AfterStep-2.2.8/libAfterBase/configure.in AfterStep-2.2.8.fix/libAfterBase/configure.in --- AfterStep-2.2.8/libAfterBase/configure.in 2008-03-04 18:18:15 +0200 +++ AfterStep-2.2.8.fix/libAfterBase/configure.in 2008-10-06 09:16:56 +0300 @@ -30,8 +30,8 @@ AC_ARG_ENABLE(i18n, [ --enable-i18n support I18N [no] ],enable_i18n=$enableval,enable_i18n="no") AC_ARG_ENABLE(xlocale, [ --enable-xlocale using X_LOCALE [no] ],enable_xlocale=$enableval,enable_xlocale="no") AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ],with_locale=$withval,with_locale="") -AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libAfterBase statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="yes") -AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libAfterBase dynamically [no] ],enable_sharedlibs=$enableval,enable_sharedlibs="no") +AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libAfterBase statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="no") +AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libAfterBase dynamically [no] ],enable_sharedlibs=$enableval,enable_sharedlibs="yes") AC_ARG_ENABLE(gdb, [ --enable-gdb add gdb symbols (-g) (for debugging) [no] ],enable_gdb=$enableval,enable_gdb="no") AC_ARG_ENABLE(warn, [ --enable-warn turn on more compiler warnings (for debugging) [no] ],enable_warn=$enableval,enable_warn="no") @@ -66,7 +66,6 @@ AC_SUBST(PERL) AC_SUBST(FIND) AC_SUBST(XARGS) - AC_SUBST(LDCONFIG) AC_SUBST(LEX) AC_SUBST(LEXLIB) AC_SUBST(YACC) @@ -137,7 +136,6 @@ AC_PATH_PROG(PERL, perl, perl) AC_PATH_PROG(FIND, find, find) AC_PATH_PROG(XARGS, xargs, xargs) - AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin) fi if test "x$enable_gdb" = "xno"; then Только в AfterStep-2.2.8.fix/libAfterBase: configure.in~ diff -ru AfterStep-2.2.8/libAfterImage/apps/Makefile.in AfterStep-2.2.8.fix/libAfterImage/apps/Makefile.in --- AfterStep-2.2.8/libAfterImage/apps/Makefile.in 2007-12-27 19:50:46 +0200 +++ AfterStep-2.2.8.fix/libAfterImage/apps/Makefile.in 2008-10-06 09:18:15 +0300 @@ -16,7 +16,6 @@ MKDIR = @MKDIR@ FIND = @FIND@ XARGS = @XARGS@ -LDCONFIG = @LDCONFIG@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL@ -m 755 Только в AfterStep-2.2.8.fix/libAfterImage/apps: Makefile.in~ diff -ru AfterStep-2.2.8/libAfterImage/configure.in AfterStep-2.2.8.fix/libAfterImage/configure.in --- AfterStep-2.2.8/libAfterImage/configure.in 2008-03-04 18:18:16 +0200 +++ AfterStep-2.2.8.fix/libAfterImage/configure.in 2008-10-06 09:16:49 +0300 @@ -28,8 +28,8 @@ AC_ARG_ENABLE(i18n, [ --enable-i18n support I18N [no] ],enable_i18n=$enableval,enable_i18n="no") AC_ARG_ENABLE(xlocale, [ --enable-xlocale using X_LOCALE [no] ],enable_xlocale=$enableval,enable_xlocale="no") AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ],with_locale=$withval,with_locale="") -AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libAfterImage statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="yes") -AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libAfterImage dynamically [no] ],enable_sharedlibs=$enableval,enable_sharedlibs="no") +AC_ARG_ENABLE(staticlibs, [ --enable-staticlibs enable linking to libAfterImage statically [yes] ],enable_staticlibs=$enableval,enable_staticlibs="no") +AC_ARG_ENABLE(sharedlibs, [ --enable-sharedlibs enable linking to libAfterImage dynamically [no] ],enable_sharedlibs=$enableval,enable_sharedlibs="yes") AC_ARG_ENABLE(gdb, [ --enable-gdb add gdb symbols (-g) (for debugging) [no] ],enable_gdb=$enableval,enable_gdb="no") AC_ARG_ENABLE(warn, [ --enable-warn turn on more compiler warnings (for debugging) [no] ],enable_warn=$enableval,enable_warn="no") @@ -108,7 +108,6 @@ AC_SUBST(PERL) AC_SUBST(FIND) AC_SUBST(XARGS) - AC_SUBST(LDCONFIG) AC_SUBST(LEX) AC_SUBST(LEXLIB) AC_SUBST(YACC) @@ -170,7 +169,6 @@ AC_PATH_PROG(PERL, perl, perl) AC_PATH_PROG(FIND, find, find) AC_PATH_PROG(XARGS, xargs, xargs) - AC_PATH_PROG(LDCONFIG, ldconfig, ldconfig, $PATH:/sbin:/usr/local/sbin) fi if test "x$enable_gdb" = "xno"; then Только в AfterStep-2.2.8.fix/libAfterImage: configure.in~ diff -ru AfterStep-2.2.8/libAfterImage/Makefile.in AfterStep-2.2.8.fix/libAfterImage/Makefile.in --- AfterStep-2.2.8/libAfterImage/Makefile.in 2007-12-27 22:57:08 +0200 +++ AfterStep-2.2.8.fix/libAfterImage/Makefile.in 2008-10-06 09:19:51 +0300 @@ -84,7 +84,6 @@ MKDIR = @MKDIR@ FIND = @FIND@ XARGS = @XARGS@ -LDCONFIG = @LDCONFIG@ ROBODOC = robodoc LN_S = @LN_S@ Только в AfterStep-2.2.8.fix/libAfterImage: Makefile.in~ diff -ru AfterStep-2.2.8/tools/installastheme.pl.in AfterStep-2.2.8.fix/tools/installastheme.pl.in --- AfterStep-2.2.8/tools/installastheme.pl.in 2001-06-23 06:50:20 +0300 +++ AfterStep-2.2.8.fix/tools/installastheme.pl.in 2008-10-06 09:02:20 +0300 @@ -116,6 +116,7 @@ my $TARFILE = 0; my $TMPDIR = "/tmp/astheme.$$"; my $UPDATE_AS = 1; +my $INSTALL_PATH = ""; ################## # Command Line Syntax Checking @@ -124,13 +125,14 @@ $usage = sprintf( "Usage: \n" . "%s [-h] [--no_wharf] [--no_pager] [--no_winlist] [--no_background]\n" . - "%*s [--no-update] [-q] [-v] [-V] [[-t] ]\n" . + "%*s [--no-update] [-q] [-v] [-V] [-p ] [[-t] ]\n" . " -h --help this help\n" . " --no_background do not install desktop background\n" . " --no_pager do not install pager options\n" . " --no_wharf do not install wharf options\n" . " --no_winlist do not install winlist options\n" . " --no-update do not tell AfterStep to load the theme\n" . + " -p --prefix install theme in \n" . " -q --quiet do not print anything\n" . " -t --theme specify theme to install\n" . " -V --verbose warn about missing options\n" . @@ -147,6 +149,9 @@ my $argument = shift; if (($argument eq "-t" || $argument eq "--theme") && @ARGV) { $THEME_NAME = shift; + } elsif ($argument eq "-p" || $argument eq "--prefix") { + die "Error: argument '' missing!\n" unless @ARGV; + $INSTALL_PATH = shift; } elsif ($argument eq "--no_wharf") { delete $MOD_FLAGS{wharf}; } elsif ($argument eq "--no_pager") { @@ -189,7 +194,7 @@ # Determine base directory names my $AFTERSTEP_DIR="~/GNUstep/Library/AfterStep"; -my $SHARE_DIR="/usr/local/share/afterstep"; +my $SHARE_DIR="/usr/X11R6/share/afterstep"; open (PROC, "afterstep -c 2> /dev/null |"); if (eof(PROC)) { @@ -205,6 +210,7 @@ close PROC; $AFTERSTEP_DIR =~ s@^~/@$ENV{HOME}/@; +$AFTERSTEP_DIR=$INSTALL_PATH if ($INSTALL_PATH); ################### # Derive some more directory names @@ -481,6 +487,8 @@ # could probably be done with a subroutine. foreach my $module (keys %MOD_FLAGS) { + copy_file($FILE_NAMES{$module}, "$FILE_NAMES{$module}.themesave"); + print "'$FILE_NAMES{$module}' saved as '$FILE_NAMES{$module}.themesave'\n"; &edit_config($module); } Только в AfterStep-2.2.8.fix/tools: installastheme.pl.in~ diff -ru AfterStep-2.2.8/tools/makeastheme.pl.in AfterStep-2.2.8.fix/tools/makeastheme.pl.in --- AfterStep-2.2.8/tools/makeastheme.pl.in 2002-04-21 10:14:05 +0300 +++ AfterStep-2.2.8.fix/tools/makeastheme.pl.in 2008-10-06 09:04:03 +0300 @@ -211,7 +211,7 @@ my $AFTERSTEP_VERSION; my $AFTERSTEP_DIR="~/GNUstep/Library/AfterStep"; -my $SHARE_DIR="/usr/local/share/afterstep"; +my $SHARE_DIR="/usr/X11R6/share/afterstep"; open (PROC, "afterstep -c 2> /dev/null |"); if (eof(PROC)) { Только в AfterStep-2.2.8.fix/tools: makeastheme.pl.in~