From 0651a2d8372ca7b98ffa31e72fba1684401e2664 Mon Sep 17 00:00:00 2001
From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 1 Oct 1998 10:06:31 +0000
Subject: [PATCH] Various automake and installation fixes.

---
 Makefile.am          | 12 ++++++++++++
 Makefile.in          | 14 +++++++++++++-
 charsets/Makefile.in |  6 +++++-
 configure            |  4 ++--
 configure.in         |  4 ++--
 5 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4e36fee7..21cfc949 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,8 @@ BUILT_SOURCES = mutt_dotlock.c
 mutt_dotlock.c: dotlock.c
 	cp dotlock.c mutt_dotlock.c
 
+CLEANFILES = mutt_dotlock.c
+
 LDADD = @LIBOBJS@ @INTLLIBS@
 
 SUBDIRS = doc intl po
@@ -35,3 +37,13 @@ keymap_defs.h: $(OPS)
 
 reldate:
 	echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
+
+install-exec-local:
+	if test -f $(bindir)/mutt.dotlock && test -f $(bindir)/mutt_dotlock ; then	\
+		rm -f $(bindir)/mutt.dotlock ;		\
+		ln -sf $(bindir)/mutt_dotlock $(bindir)/mutt.dotlock ; \
+	fi
+	if test -f $(bindir)/mutt_dotlock && test x@DOTLOCK_PERMISSION@ != x ; then \
+		chgrp @DOTLOCK_GROUP@ $(bindir)/mutt_dotlock ; \
+		chmod @DOTLOCK_PERMISSION@  $(bindir)/mutt_dotlock ; \
+	fi
diff --git a/Makefile.in b/Makefile.in
index 76177b17..2c4b1c2c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -120,6 +120,8 @@ EXTRA_mutt_SOURCES = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
 
 BUILT_SOURCES = mutt_dotlock.c
 
+CLEANFILES = mutt_dotlock.c
+
 LDADD = @LIBOBJS@ @INTLLIBS@
 
 SUBDIRS = doc intl po
@@ -427,7 +429,7 @@ all-recursive-am: config.h
 
 all-am: Makefile $(PROGRAMS) config.h
 
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-exec-local
 
 uninstall-am: uninstall-binPROGRAMS
 
@@ -518,6 +520,16 @@ keymap_defs.h: $(OPS)
 reldate:
 	echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > $(srcdir)/reldate.h
 
+install-exec-local:
+	if test -f $(bindir)/mutt.dotlock && test -f $(bindir)/mutt_dotlock ; then	\
+		rm -f $(bindir)/mutt.dotlock ;		\
+		ln -sf $(bindir)/mutt_dotlock $(bindir)/mutt.dotlock ; \
+	fi
+	if test -f $(bindir)/mutt_dotlock && test x@DOTLOCK_PERMISSION@ != x ; then \
+		chgrp @DOTLOCK_GROUP@ $(bindir)/mutt_dotlock ; \
+		chmod @DOTLOCK_PERMISSION@  $(bindir)/mutt_dotlock ; \
+	fi
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/charsets/Makefile.in b/charsets/Makefile.in
index 5755c10d..c97e1e22 100644
--- a/charsets/Makefile.in
+++ b/charsets/Makefile.in
@@ -48,4 +48,8 @@ install: charsets.list
 	$(srcdir)/../mkinstalldirs $(sharedir)/charsets
 	( cd $(srcdir) && $(INSTALL) \
 		-m 644 `cat charsets.list` $(sharedir)/charsets )
-	$(INSTALL) -m 644 charsets.alias $(sharedir)/charsets
+	$(INSTALL) -m 644 charsets.alias $(sharedir)/charsets/charsets.alias.dist
+	test -f $(sharedir)/charsets/charsets.alias || 			\
+	  $(INSTALL) -m 644 $(sharedir)/charsets/charsets.alias.dist	\
+			$(sharedir)/charsets/charsets.alias
+
diff --git a/configure b/configure
index 66c1790b..4fc9d53c 100755
--- a/configure
+++ b/configure
@@ -2952,7 +2952,7 @@ docdir=$mutt_cv_docdir
 
 
 if test x$mutt_cv_setgid = xyes; then
-	DOTLOCK_GROUP='-g mail'
+	DOTLOCK_GROUP='mail'
 	DOTLOCK_PERMISSION=2755
 else
 	DOTLOCK_GROUP=''
@@ -5092,7 +5092,7 @@ fi
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
   
-MUTTLOCALEDIR=$sharedir/locale
+MUTTLOCALEDIR=$mutt_cv_prefix/$DATADIRNAME/locale
 
 cat >> confdefs.h <<EOF
 #define MUTTLOCALEDIR "$MUTTLOCALEDIR"
diff --git a/configure.in b/configure.in
index 648d49ca..dad3f56e 100644
--- a/configure.in
+++ b/configure.in
@@ -357,7 +357,7 @@ AC_SUBST(docdir)
 
 
 if test x$mutt_cv_setgid = xyes; then
-	DOTLOCK_GROUP='-g mail'
+	DOTLOCK_GROUP='mail'
 	DOTLOCK_PERMISSION=2755
 else
 	DOTLOCK_GROUP=''
@@ -436,7 +436,7 @@ AC_ARG_ENABLE(exact-address, [  --enable-exact-address     enable regeneration o
 AC_SUBST(MUTT_LIB_OBJECTS)
 
 AM_GNU_GETTEXT
-MUTTLOCALEDIR=$sharedir/locale
+MUTTLOCALEDIR=$mutt_cv_prefix/$DATADIRNAME/locale
 AC_SUBST(MUTTLOCALEDIR)
 AC_DEFINE_UNQUOTED(MUTTLOCALEDIR, "$MUTTLOCALEDIR")
 
-- 
2.40.0