blob: 8eba97c5bee703cffd801c99802843b1a3136d18 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
$NetBSD: patch-ac,v 1.3 2008/04/22 16:23:57 jlam Exp $
--- Makefile.in.orig 2003-10-20 22:32:25.000000000 -0400
+++ Makefile.in
@@ -89,6 +89,11 @@ DATADIR=$(PREFIX)/share/elvis
DOCDIR= $(PREFIX)/share/elvis/doc
################################################################################
+# This is the directory where "make install" will place the customized elvis
+# configuration files.
+SYSCONFDIR=/etc/elvis
+
+################################################################################
# This is the shell command for copying one file to another
CP=cp
@@ -440,23 +445,16 @@ install.unix: $(ALL) doc/elvtags.man
(cd doc; for i in *.man; do sed 's/Elvis 2\.[0-9x][0-9a-z-]*/Elvis $(VERSION)/' $$i >$(DOCDIR)/$$i; done)
-(cd $(DATADIR); $(BINDIR)/elvtags -gitv stubs/*.c || ctags stubs/*.c)
chmod 0755 $(DATADIR)/*/. $(DATADIR) $(DOCDIR)
- sh instman.sh -p$(PREFIX) $(ALL)
- -[ -d /etc/elvis ] || mkdir /etc/elvis
- -chmod 0755 /etc/elvis/
- -@ : >/etc/elvis/README && ( \
- echo "This directory contains system-dependent versions of elvis' configuration" \
- echo "files. The standard versions are available in $(DATADIR)" \
- echo "To customize any of these configuration files for this system," \
- echo "first copy the standard version of the file into /etc/elvis and" \
- echo "then edit the copy. Leave the standard version unchanged." \
- ) >>/etc/elvis/README
- -chmod 0644 /etc/elvis/README
+ ${BSD_INSTALL_MAN} doc/elvfmt.man $(PREFIX)/${PKGMANDIR}/man1/elvfmt.1
+ ${BSD_INSTALL_MAN} doc/elvis.man $(PREFIX)/${PKGMANDIR}/man1/elvis.1
+ ${BSD_INSTALL_MAN} doc/elvtags.man $(PREFIX)/${PKGMANDIR}/man1/elvtags.1
+ ${BSD_INSTALL_MAN} doc/ref.man $(PREFIX)/${PKGMANDIR}/man1/ref.1
@echo "This directory contains the standard versions of elvis' configuration" >$(DATADIR)/README
@echo "files. DO NOT MODIFY THESE FILES! To perform host-specific customization," >>$(DATADIR)/README
- @echo "copy files from this directory into /etc/elvis/, and then modify the copies." >>$(DATADIR)/README
+ @echo "copy files from this directory into $(SYSCONFDIR)/, and then modify the copies." >>$(DATADIR)/README
@echo "To make user-specific changes, create a ~/.elvis/ directory (if it doesn't" >>$(DATADIR)/README
@echo "exist already) and copy files from this directory into ~/.elvis/ and then" >>$(DATADIR)/README
- @echo "modify the copies. Any file that elvis finds in ~/.elvis/ or /etc/elvis/" >>$(DATADIR)/README
+ @echo "modify the copies. Any file that elvis finds in ~/.elvis/ or $(SYSCONFDIR)/" >>$(DATADIR)/README
@echo "overrides the similarly named file in this directory." >>$(DATADIR)/README
chmod 0644 $(DATADIR)/README
|
