Lines 1-17
Link Here
|
1 |
--- Makefile.orig 2005-03-24 23:50:09 UTC |
1 |
--- Makefile.orig 2005-03-24 15:50:09 UTC |
2 |
+++ Makefile |
2 |
+++ Makefile |
3 |
@@ -79,10 +79,9 @@ |
3 |
@@ -79,7 +79,6 @@ |
4 |
# Destinations for installation. $(PRESERVEDIR) is used for recovery files. |
4 |
# Destinations for installation. $(PRESERVEDIR) is used for recovery files. |
5 |
# It will get mode 1777. |
5 |
# It will get mode 1777. |
6 |
# |
6 |
# |
7 |
-PREFIX = /usr/local |
7 |
-PREFIX = /usr/local |
8 |
BINDIR = $(PREFIX)/bin |
8 |
BINDIR = $(PREFIX)/bin |
9 |
LIBEXECDIR = $(PREFIX)/libexec |
9 |
LIBEXECDIR = $(PREFIX)/libexec |
10 |
-MANDIR = $(PREFIX)/share/man |
10 |
MANDIR = $(PREFIX)/share/man |
11 |
+MANDIR = $(PREFIX)/man |
|
|
12 |
PRESERVEDIR = /var/preserve |
13 |
|
14 |
# |
15 |
@@ -94,7 +93,7 @@ |
11 |
@@ -94,7 +93,7 @@ |
16 |
# |
12 |
# |
17 |
# A BSD-like install program. GNU install will fit well here, too. |
13 |
# A BSD-like install program. GNU install will fit well here, too. |
Lines 56-62
Link Here
|
56 |
INCLUDE = /usr/include |
52 |
INCLUDE = /usr/include |
57 |
OBJS = ex.o ex_addr.o ex_cmds.o ex_cmds2.o ex_cmdsub.o \ |
53 |
OBJS = ex.o ex_addr.o ex_cmds.o ex_cmds2.o ex_cmdsub.o \ |
58 |
ex_data.o ex_extern.o ex_get.o ex_io.o ex_put.o ex_re.o \ |
54 |
ex_data.o ex_extern.o ex_get.o ex_io.o ex_put.o ex_re.o \ |
59 |
@@ -296,13 +292,6 @@ |
55 |
@@ -296,24 +292,13 @@ |
60 |
# install in standard place |
56 |
# install in standard place |
61 |
|
57 |
|
62 |
install-man: |
58 |
install-man: |
Lines 70-83
Link Here
|
70 |
$(INSTALL) -c -m 644 ex.1 $(DESTDIR)$(MANDIR)/man1/ex.1 |
66 |
$(INSTALL) -c -m 644 ex.1 $(DESTDIR)$(MANDIR)/man1/ex.1 |
71 |
$(INSTALL) -c -m 644 vi.1 $(DESTDIR)$(MANDIR)/man1/vi.1 |
67 |
$(INSTALL) -c -m 644 vi.1 $(DESTDIR)$(MANDIR)/man1/vi.1 |
72 |
ln -s ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1 |
68 |
ln -s ex.1 $(DESTDIR)$(MANDIR)/man1/edit.1 |
73 |
@@ -310,10 +299,6 @@ |
69 |
ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/vedit.1 |
74 |
ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/view.1 |
70 |
ln -s vi.1 $(DESTDIR)$(MANDIR)/man1/view.1 |
75 |
|
71 |
|
76 |
install: all install-man |
72 |
-install: all install-man |
77 |
- rm -f $(DESTDIR)$(BINDIR)/ex $(DESTDIR)$(BINDIR)/edit \ |
73 |
- rm -f $(DESTDIR)$(BINDIR)/ex $(DESTDIR)$(BINDIR)/edit \ |
78 |
- $(DESTDIR)$(BINDIR)/vedit $(DESTDIR)$(BINDIR)/vi \ |
74 |
- $(DESTDIR)$(BINDIR)/vedit $(DESTDIR)$(BINDIR)/vi \ |
79 |
- $(DESTDIR)$(BINDIR)/view |
75 |
- $(DESTDIR)$(BINDIR)/view |
80 |
- test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) |
76 |
- test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) |
|
|
77 |
+install: all install-man |
81 |
# special provisions for sticky install |
78 |
# special provisions for sticky install |
82 |
if test -f $(DESTDIR)$(BINDIR)/ex; \ |
79 |
if test -f $(DESTDIR)$(BINDIR)/ex; \ |
83 |
then test -f $(DESTDIR)$(BINDIR)/ex.old.$$$$ && exit 1; \ |
80 |
then test -f $(DESTDIR)$(BINDIR)/ex.old.$$$$ && exit 1; \ |