| @@ -1,39 +1,44 @@ | | | @@ -1,39 +1,44 @@ |
1 | $NetBSD: patch-aa,v 1.8 2006/07/16 09:17:15 rillig Exp $ | | 1 | $NetBSD: patch-aa,v 1.9 2009/07/08 17:11:23 joerg Exp $ |
2 | | | 2 | |
3 | --- Makefile.in.orig 2003-11-28 22:12:57.000000000 +0100 | | 3 | --- Makefile.in.orig 2003-11-28 22:12:57.000000000 +0100 |
4 | +++ Makefile.in 2006-07-16 10:56:17.000000000 +0200 | | 4 | +++ Makefile.in |
5 | @@ -18,10 +18,7 @@ bindir = @bindir@ | | 5 | @@ -18,10 +18,7 @@ bindir = @bindir@ |
6 | mandir = @mandir@ | | 6 | mandir = @mandir@ |
7 | man6dir = $(mandir)/man6 | | 7 | man6dir = $(mandir)/man6 |
8 | man6ext = .6 | | 8 | man6ext = .6 |
9 | -# Yuck; the autoconf generated configure script sets an infodir variable | | 9 | -# Yuck; the autoconf generated configure script sets an infodir variable |
10 | -# and provides a command-line flag to change it, but the default is | | 10 | -# and provides a command-line flag to change it, but the default is |
11 | -# /usr/info instead of /usr/share/info. | | 11 | -# /usr/info instead of /usr/share/info. |
12 | -infodir = $(prefix)/share/info | | 12 | -infodir = $(prefix)/share/info |
13 | +infodir = @infodir@ | | 13 | +infodir = @infodir@ |
14 | | | 14 | |
15 | CC = @CC@ | | 15 | CC = @CC@ |
16 | CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\" | | 16 | CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\" |
17 | @@ -63,15 +60,14 @@ default: xboard zic2xpm | | 17 | @@ -63,18 +60,17 @@ default: xboard zic2xpm |
18 | all: default pseudosource info FAQ html dvi ps | | 18 | all: default pseudosource info FAQ html dvi ps |
19 | | | 19 | |
20 | install: installdirs default | | 20 | install: installdirs default |
21 | - $(INSTALL_PROGRAM) -s xboard $(bindir)/xboard | | 21 | - $(INSTALL_PROGRAM) -s xboard $(bindir)/xboard |
22 | - $(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm | | 22 | - $(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm |
23 | - $(INSTALL_PROGRAM) cmail $(bindir)/cmail | | 23 | - $(INSTALL_PROGRAM) cmail $(bindir)/cmail |
24 | - $(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard | | 24 | - $(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard |
25 | - $(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext) | | 25 | - $(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext) |
26 | - $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext) | | 26 | - $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext) |
27 | + $(BSD_INSTALL_PROGRAM) xboard $(bindir)/xboard | | 27 | - $(INSTALL_DATA) xboard.info $(infodir)/xboard.info |
28 | + $(BSD_INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm | | | |
29 | + $(BSD_INSTALL_SCRIPT) cmail $(bindir)/cmail | | | |
30 | + $(BSD_INSTALL_SCRIPT) $(srcdir)/pxboard $(bindir)/pxboard | | | |
31 | + $(BSD_INSTALL_MAN) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext) | | | |
32 | + $(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext) | | | |
33 | $(INSTALL_DATA) xboard.info $(infodir)/xboard.info | | | |
34 | - -PATH=$$PATH:/sbin:/usr/sbin install-info \ | | 28 | - -PATH=$$PATH:/sbin:/usr/sbin install-info \ |
35 | - $(infodir)/xboard.info $(infodir)/dir | | 29 | - $(infodir)/xboard.info $(infodir)/dir |
36 | + $(INSTALL_INFO) $(infodir)/xboard.info $(infodir)/dir | | 30 | + $(BSD_INSTALL_PROGRAM) xboard ${DESTDIR}$(bindir)/xboard |
| | | 31 | + $(BSD_INSTALL_PROGRAM) zic2xpm ${DESTDIR}$(bindir)/zic2xpm |
| | | 32 | + $(BSD_INSTALL_SCRIPT) cmail ${DESTDIR}$(bindir)/cmail |
| | | 33 | + $(BSD_INSTALL_SCRIPT) $(srcdir)/pxboard ${DESTDIR}$(bindir)/pxboard |
| | | 34 | + $(BSD_INSTALL_MAN) $(srcdir)/xboard.man ${DESTDIR}$(man6dir)/xboard$(man6ext) |
| | | 35 | + $(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man ${DESTDIR}$(man6dir)/zic2xpm$(man6ext) |
| | | 36 | + $(INSTALL_DATA) xboard.info ${DESTDIR}$(infodir)/xboard.info |
| | | 37 | + $(INSTALL_INFO) ${DESTDIR}$(infodir)/xboard.info ${DESTDIR}$(infodir)/dir |
37 | | | 38 | |
38 | installdirs: mkinstalldirs | | 39 | installdirs: mkinstalldirs |
39 | $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir) | | 40 | - $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir) |
| | | 41 | + $(srcdir)/mkinstalldirs ${DESTDIR}$(bindir) ${DESTDIR}$(mandir) ${DESTDIR}$(man6dir) ${DESTDIR}$(infodir) |
| | | 42 | |
| | | 43 | uninstall: |
| | | 44 | rm -f $(bindir)/xboard $(bindir)/cmail $(bindir)/pxboard |