| @@ -1,49 +1,49 @@ | | | @@ -1,49 +1,49 @@ |
1 | $NetBSD: patch-Makefile,v 1.1 2018/01/03 13:06:17 fhajny Exp $ | | 1 | $NetBSD: patch-Makefile,v 1.2 2018/01/30 16:27:11 fhajny Exp $ |
2 | | | 2 | |
3 | Use portable sed calls to avoid gsed. | | 3 | Use portable sed calls to avoid gsed. |
4 | Use pkgsrc paths for man pages. | | 4 | Use pkgsrc paths for man pages. |
5 | | | 5 | |
6 | --- Makefile.orig 2017-09-29 12:00:01.000000000 +0000 | | 6 | --- Makefile.orig 2018-01-29 19:47:48.000000000 +0000 |
7 | +++ Makefile | | 7 | +++ Makefile |
8 | @@ -107,7 +107,7 @@ install: compile | | 8 | @@ -101,7 +101,7 @@ install: compile |
9 | $(INSTALL_DATA) $$dir/ebin/* "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/$$dir/ebin"; \ | | 9 | $(INSTALL_DATA) $$dir/ebin/* "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/$$dir/ebin"; \ |
10 | done | | 10 | done |
11 | $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin" | | 11 | $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin" |
12 | - $(Q) $(INSTALL_PROGRAM) $(filter-out %.ps1, $(filter-out %.bat, $(wildcard bin/*))) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin" | | 12 | - $(Q) $(INSTALL_PROGRAM) $(filter-out %.ps1, $(filter-out %.bat, $(wildcard bin/*))) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin" |
13 | + $(Q) $(INSTALL_PROGRAM) $(filter-out %.ps1, $(filter-out %.bat, $(filter-out %.orig, $(wildcard bin/*)))) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin" | | 13 | + $(Q) $(INSTALL_PROGRAM) $(filter-out %.ps1, $(filter-out %.bat, $(filter-out %.orig, $(wildcard bin/*)))) "$(DESTDIR)$(PREFIX)/$(LIBDIR)/elixir/bin" |
14 | $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(BINDIR)" | | 14 | $(Q) $(INSTALL_DIR) "$(DESTDIR)$(PREFIX)/$(BINDIR)" |
15 | $(Q) for file in "$(DESTDIR)$(PREFIX)"/$(LIBDIR)/elixir/bin/*; do \ | | 15 | $(Q) for file in "$(DESTDIR)$(PREFIX)"/$(LIBDIR)/elixir/bin/*; do \ |
16 | ln -sf "../$(LIBDIR)/elixir/bin/$${file##*/}" "$(DESTDIR)$(PREFIX)/$(BINDIR)/"; \ | | 16 | ln -sf "../$(LIBDIR)/elixir/bin/$${file##*/}" "$(DESTDIR)$(PREFIX)/$(BINDIR)/"; \ |
17 | @@ -250,14 +250,14 @@ build_man: man/iex.1 man/elixir.1 | | 17 | @@ -243,14 +243,14 @@ build_man: man/iex.1 man/elixir.1 |
18 | | | 18 | |
19 | man/iex.1: | | 19 | man/iex.1: |
20 | $(Q) cp man/iex.1.in man/iex.1 | | 20 | $(Q) cp man/iex.1.in man/iex.1 |
21 | - $(Q) sed -i.bak "/{COMMON}/r common" man/iex.1 | | 21 | - $(Q) sed -i.bak "/{COMMON}/r man/common" man/iex.1 |
22 | - $(Q) sed -i.bak "/{COMMON}/d" man/iex.1 | | 22 | - $(Q) sed -i.bak "/{COMMON}/d" man/iex.1 |
23 | + $(Q) sed "/{COMMON}/r common" man/iex.1 > man/iex.1.bak | | 23 | + $(Q) sed "/{COMMON}/r man/common" man/iex.1 > man/iex.1.bak |
24 | + $(Q) sed "/{COMMON}/d" man/iex.1.bak > man/iex.1 | | 24 | + $(Q) sed "/{COMMON}/d" man/iex.1.bak > man/iex.1 |
25 | $(Q) rm -f man/iex.1.bak | | 25 | $(Q) rm -f man/iex.1.bak |
26 | | | 26 | |
27 | man/elixir.1: | | 27 | man/elixir.1: |
28 | $(Q) cp man/elixir.1.in man/elixir.1 | | 28 | $(Q) cp man/elixir.1.in man/elixir.1 |
29 | - $(Q) sed -i.bak "/{COMMON}/r common" man/elixir.1 | | 29 | - $(Q) sed -i.bak "/{COMMON}/r man/common" man/elixir.1 |
30 | - $(Q) sed -i.bak "/{COMMON}/d" man/elixir.1 | | 30 | - $(Q) sed -i.bak "/{COMMON}/d" man/elixir.1 |
31 | + $(Q) sed "/{COMMON}/r common" man/elixir.1 > man/elixir.1.bak | | 31 | + $(Q) sed "/{COMMON}/r man/common" man/elixir.1 > man/elixir.1.bak |
32 | + $(Q) sed "/{COMMON}/d" man/elixir.1.bak > man/elixir.1 | | 32 | + $(Q) sed "/{COMMON}/d" man/elixir.1.bak > man/elixir.1 |
33 | $(Q) rm -f man/elixir.1.bak | | 33 | $(Q) rm -f man/elixir.1.bak |
34 | | | 34 | |
35 | clean_man: | | 35 | clean_man: |
36 | @@ -267,9 +267,9 @@ clean_man: | | 36 | @@ -260,9 +260,9 @@ clean_man: |
37 | rm -f man/iex.1.bak | | 37 | rm -f man/iex.1.bak |
38 | | | 38 | |
39 | install_man: build_man | | 39 | install_man: build_man |
40 | - $(Q) mkdir -p $(DESTDIR)$(SHARE_PREFIX)/man/man1 | | 40 | - $(Q) mkdir -p $(DESTDIR)$(SHARE_PREFIX)/man/man1 |
41 | - $(Q) $(INSTALL_DATA) man/elixir.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 | | 41 | - $(Q) $(INSTALL_DATA) man/elixir.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 |
42 | - $(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 | | 42 | - $(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 |
43 | - $(Q) $(INSTALL_DATA) man/iex.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 | | 43 | - $(Q) $(INSTALL_DATA) man/iex.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 |
44 | - $(Q) $(INSTALL_DATA) man/mix.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 | | 44 | - $(Q) $(INSTALL_DATA) man/mix.1 $(DESTDIR)$(SHARE_PREFIX)/man/man1 |
45 | + $(Q) mkdir -p $(DESTDIR)$(PREFIX)/man/man1 | | 45 | + $(Q) mkdir -p $(DESTDIR)$(PREFIX)/man/man1 |
46 | + $(Q) $(INSTALL_DATA) man/elixir.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 | | 46 | + $(Q) $(INSTALL_DATA) man/elixir.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 |
47 | + $(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 | | 47 | + $(Q) $(INSTALL_DATA) man/elixirc.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 |
48 | + $(Q) $(INSTALL_DATA) man/iex.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 | | 48 | + $(Q) $(INSTALL_DATA) man/iex.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 |
49 | + $(Q) $(INSTALL_DATA) man/mix.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 | | 49 | + $(Q) $(INSTALL_DATA) man/mix.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1 |