4b2b4a974e
conflict with digest(1)'s manual page. The majordomo digest command lives in libexec, anyway. Bump version to majordomo-1.94.4nb1 Addresses PR 12385, from Jun-ichiro itojun Hagino
140 lines
4.4 KiB
Text
140 lines
4.4 KiB
Text
$NetBSD: patch-aa,v 1.2 2001/03/27 11:53:18 agc Exp $
|
|
|
|
--- Makefile.orig Wed Aug 27 16:56:21 1997
|
|
+++ Makefile Tue Mar 27 12:41:29 2001
|
|
@@ -13,27 +13,29 @@
|
|
#
|
|
|
|
# Put the location of your Perl binary here:
|
|
-PERL = /bin/perl
|
|
+PERL = @LOCALBASE@/bin/perl
|
|
|
|
# What do you call your C compiler?
|
|
CC = cc
|
|
|
|
# Where do you want Majordomo to be installed? This CANNOT be the
|
|
# current directory (where you unpacked the distribution)
|
|
-W_HOME = /usr/test/majordomo-$(VERSION)
|
|
+W_HOME = @PREFIX@/libexec/majordomo
|
|
+HOME = @HOME@/@MAJORDOMO_USER@
|
|
|
|
# Where do you want man pages to be installed?
|
|
-MAN = $(W_HOME)/man
|
|
+MAN = @PREFIX@/man
|
|
|
|
# You need to have or create a user and group which majordomo will run as.
|
|
# Enter the numeric UID and GID (not their names!) here:
|
|
-W_USER = 123
|
|
-W_GROUP = 45
|
|
+W_USER = @UID@
|
|
+W_GROUP = @GID@
|
|
|
|
# These set the permissions for all installed files and executables (except
|
|
# the wrapper), respectively. Some sites may wish to make these more
|
|
# lenient, or more restrictive.
|
|
-FILE_MODE = 644
|
|
+CF_MODE = 664
|
|
+MAN_MODE = 444
|
|
EXEC_MODE = 755
|
|
HOME_MODE = 751
|
|
|
|
@@ -62,11 +64,11 @@
|
|
# parent process, and without the leading "W_" in the variable names) gets
|
|
# passed to processes run by "wrapper"
|
|
W_SHELL = /bin/sh
|
|
-W_PATH = /bin:/usr/bin:/usr/ucb
|
|
-W_MAJORDOMO_CF = $(W_HOME)/majordomo.cf
|
|
+W_PATH = /bin:/usr/bin
|
|
+W_MAJORDOMO_CF = @HOME@/@MAJORDOMO_USER@/majordomo.cf
|
|
|
|
# A directory for temp files..
|
|
-TMPDIR = /usr/tmp
|
|
+TMPDIR = @TMPDIR@
|
|
|
|
#--------YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW THIS LINE.-------------
|
|
|
|
@@ -76,7 +78,7 @@
|
|
SHELL = /bin/sh
|
|
|
|
WRAPPER_FLAGS = -DBIN=\"$(W_HOME)\" -DPATH=\"PATH=$(W_PATH)\" \
|
|
- -DHOME=\"HOME=$(W_HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
|
|
+ -DHOME=\"HOME=$(HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
|
|
-DMAJORDOMO_CF=\"MAJORDOMO_CF=$(W_MAJORDOMO_CF)\" \
|
|
$(POSIX)
|
|
|
|
@@ -144,13 +146,12 @@
|
|
|
|
install-scripts: config-scripts
|
|
$(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(W_HOME)
|
|
- $(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(W_HOME)/bin
|
|
|
|
- @echo "Copying tools to $(W_HOME)/bin"
|
|
+ @echo "Copying tools to @PREFIX@/bin"
|
|
|
|
@for file in $(BINBIN); do \
|
|
$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
|
|
- $(TMP)/$$file $(W_HOME)/bin/$$file; \
|
|
+ $(TMP)/$$file @PREFIX@/bin/$$file; \
|
|
done
|
|
|
|
@echo "Copying Majordomo files to $(W_HOME)"
|
|
@@ -177,45 +178,39 @@
|
|
# all cases, the sample.cf file must be installed so that config-test will
|
|
# be able to check for new variables.
|
|
install-cf:
|
|
- @if [ ! -f $(W_HOME)/majordomo.cf ]; \
|
|
+ @if [ ! -f $(W_MAJORDOMO_CF) ]; \
|
|
then \
|
|
if [ -f majordomo.cf ]; \
|
|
then \
|
|
echo "Using majordomo.cf"; \
|
|
- $(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
- majordomo.cf $(W_HOME)/majordomo.cf; \
|
|
+ $(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
|
|
+ majordomo.cf $(W_MAJORDOMO_CF); \
|
|
else \
|
|
echo "Using sample.cf"; \
|
|
- $(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
- sample.cf $(W_HOME)/majordomo.cf; \
|
|
+ $(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
|
|
+ sample.cf $(W_MAJORDOMO_CF); \
|
|
fi; \
|
|
else \
|
|
echo "Using installed majordomo.cf"; \
|
|
fi;
|
|
- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
+ @$(INSTALL) -m $(CF_MODE) $(INSTALL_FLAGS) \
|
|
sample.cf $(W_HOME)
|
|
|
|
install-man:
|
|
@echo "Installing manual pages in $(MAN)"
|
|
- @$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
|
|
- . $(MAN)
|
|
- @$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
|
|
- . $(MAN)/man1
|
|
- @$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) \
|
|
- . $(MAN)/man8
|
|
- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
|
|
Doc/man/approve.1 $(MAN)/man1/approve.1
|
|
- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
- Doc/man/digest.1 $(MAN)/man1/digest.1
|
|
- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
|
|
+ Doc/man/digest.1 $(MAN)/man8/digest.8
|
|
+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
|
|
Doc/man/bounce.1 $(MAN)/man1/bounce.1
|
|
- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
|
|
Doc/man/bounce-remind.1 $(MAN)/man1/bounce-remind.1
|
|
- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
|
|
Doc/man/resend.1 $(MAN)/man1/resend.1
|
|
- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
|
|
Doc/man/majordomo.8 $(MAN)/man8/majordomo.8
|
|
- @$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
|
|
+ @$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
|
|
Doc/man/resend.1 $(MAN)/man1/resend.1
|
|
|
|
wrapper: wrapper.c
|