summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore12
-rw-r--r--alpine/keymenu.c15
-rw-r--r--alpine/keymenu.h1
-rw-r--r--alpine/mailcmd.c2
-rw-r--r--po/Makefile.in55
5 files changed, 50 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..8b61bcf2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+*.[ao]
+*~
+Make*
+make*
+alpine
+pico
+rpdump
+rpload
+imapd
+pop3d
+pop2d
+mailutil
diff --git a/alpine/keymenu.c b/alpine/keymenu.c
index 929e6ada..6234a2ac 100644
--- a/alpine/keymenu.c
+++ b/alpine/keymenu.c
@@ -315,21 +315,6 @@ struct key context_fcc_keys[] =
WHEREIS_MENU};
INST_KEY_MENU(c_fcc_km, context_fcc_keys);
-static struct key quota_keys[] =
- {HELP_MENU,
- NULL_MENU,
- {"E","Exit",{MC_EXIT,3,{'e','i',ctrl('C')}},KS_EXITMODE},
- NULL_MENU,
- NULL_MENU,
- NULL_MENU,
- NULL_MENU,
- NULL_MENU,
- NULL_MENU,
- NULL_MENU,
- NULL_MENU,
- NULL_MENU};
-INST_KEY_MENU(pine_quota_keymenu, quota_keys);
-
struct key folder_keys[] =
{HELP_MENU,
OTHER_MENU,
diff --git a/alpine/keymenu.h b/alpine/keymenu.h
index 0802c20d..3b603fca 100644
--- a/alpine/keymenu.h
+++ b/alpine/keymenu.h
@@ -560,7 +560,6 @@ extern struct key_menu cancel_keymenu,
c_cfg_km,
c_sel_km,
c_fcc_km,
- pine_quota_keymenu,
folder_km,
folder_sel_km,
folder_sela_km,
diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c
index fa781556..7388005c 100644
--- a/alpine/mailcmd.c
+++ b/alpine/mailcmd.c
@@ -8995,7 +8995,7 @@ void cmd_quota (struct pine *state)
sargs.proc.tool = NULL;
sargs.help.text = h_quota_command;
sargs.help.title = NULL;
- sargs.keys.menu = &pine_quota_keymenu;
+ sargs.keys.menu = NULL;
setbitmap(sargs.keys.bitmap);
scrolltool(&sargs);
diff --git a/po/Makefile.in b/po/Makefile.in
index bf134228..6b6de4d4 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -1,5 +1,5 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
#
# This file can be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU General Public
@@ -8,11 +8,11 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.14.4
+# Origin: gettext-0.16
PACKAGE = alpine
VERSION = 2.10
-PACKAGE_BUGREPORT = chappa@gmx.com
+PACKAGE_BUGREPORT = alpine-contact@u.washington.edu
SHELL = /bin/sh
@@ -23,18 +23,38 @@ top_srcdir = ..
prefix = /usr/local
exec_prefix = ${prefix}
-datadir = ${prefix}/share
-localedir = $(datadir)/locale
+datarootdir = ${prefix}/share
+datadir = ${datarootdir}
+localedir = ${datadir}/locale
gettextsrcdir = $(datadir)/gettext/po
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
-MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-GMSGFMT = /usr/bin/msgfmt
-MSGFMT = /usr/bin/msgfmt
-XGETTEXT = /usr/bin/xgettext
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# ${SHELL} /media/Alpine/alpine/alpine/install-sh does not start with $(SHELL), so we add it.
+# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) ${SHELL} /media/Alpine/alpine/alpine/install-sh -d
+install_sh = $(SHELL) ${SHELL} /media/Alpine/alpine/alpine/install-sh
+MKDIR_P = /bin/mkdir -p
+mkdir_p = /bin/mkdir -p
+
+GMSGFMT_ = /usr/bin/msgfmt
+GMSGFMT_no = /usr/bin/msgfmt
+GMSGFMT_yes = /usr/bin/msgfmt
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = /usr/bin/msgfmt
+MSGFMT_no = /usr/bin/msgfmt
+MSGFMT_yes = /usr/bin/msgfmt
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = /usr/bin/xgettext
+XGETTEXT_no = /usr/bin/xgettext
+XGETTEXT_yes = /usr/bin/xgettext
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
MSGMERGE = msgmerge
MSGMERGE_UPDATE = /usr/bin/msgmerge --update
MSGINIT = msginit
@@ -158,7 +178,7 @@ install: install-exec install-data
install-exec:
install-data: install-data-yes
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
for file in $(DISTFILES.common) Makevars.template; do \
$(INSTALL_DATA) $(srcdir)/$$file \
$(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -171,13 +191,13 @@ install-data: install-data-yes
fi
install-data-no: all
install-data-yes: all
- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ $(mkdir_p) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
@@ -217,19 +237,19 @@ installdirs: installdirs-exec installdirs-data
installdirs-exec:
installdirs-data: installdirs-data-yes
if test "$(PACKAGE)" = "gettext-tools"; then \
- $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
else \
: ; \
fi
installdirs-data-no:
installdirs-data-yes:
- $(mkinstalldirs) $(DESTDIR)$(datadir)
+ $(mkdir_p) $(DESTDIR)$(datadir)
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
dir=$(localedir)/$$lang/LC_MESSAGES; \
- $(mkinstalldirs) $(DESTDIR)$$dir; \
+ $(mkdir_p) $(DESTDIR)$$dir; \
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
if test -n "$$lc"; then \
if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
@@ -374,8 +394,7 @@ update-gmo: Makefile $(GMOFILES)
Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
- $(SHELL) ./config.status
+ && $(SHELL) ./config.status $(subdir)/$@.in po-directories
force:
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-23 19:01:22 +0000