diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-02-18 09:04:15 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-02-18 09:04:15 +0000 |
| commit | 78f420e7a9806ff182c17dfa5161b3f0dc224efc (patch) | |
| tree | 2369f4b1008cd29096b695820df66ca4c1c6439b | |
| parent | 664c79cf734da780461547a326b9bd4d1b750b6f (diff) | |
| download | rtmux-78f420e7a9806ff182c17dfa5161b3f0dc224efc.tar.gz rtmux-78f420e7a9806ff182c17dfa5161b3f0dc224efc.tar.bz2 rtmux-78f420e7a9806ff182c17dfa5161b3f0dc224efc.zip | |
Reuse CPPFLAGS.
| -rw-r--r-- | GNUmakefile | 7 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index 18a1fecd..1012c571 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.73 2009-02-18 08:50:30 nicm Exp $ +# $Id: GNUmakefile,v 1.74 2009-02-18 09:04:15 nicm Exp $ .PHONY: clean @@ -62,7 +62,6 @@ LDFLAGS+= LIBS+= -lncurses PREFIX?= /usr/local -MANDIR?= $(PREFIX)/man/man1 INSTALLDIR= install -d INSTALLBIN= install -g bin -o root -m 555 INSTALLMAN= install -g bin -o root -m 444 @@ -123,8 +122,8 @@ depend: $(SRCS) install: $(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin $(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG) - $(INSTALLDIR) $(DESTDIR)$(MANDIR) - $(INSTALLMAN) $(PROG).1 $(DESTDIR)$(MANDIR) + $(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1 + $(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1 clean: rm -f $(CLEANFILES) @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.114 2009-02-18 08:50:30 nicm Exp $ +# $Id: Makefile,v 1.115 2009-02-18 09:04:15 nicm Exp $ .SUFFIXES: .c .o .y .h .PHONY: clean update-index.html upload-index.html @@ -144,6 +144,6 @@ update-index.html: install: all ${INSTALLDIR} ${DESTDIR}${PREFIX}/bin - ${INSTALLBIN} ${PROG} ${DESTDIR}${PREFIX}/bin/${PROG} + ${INSTALLBIN} ${PROG} ${DESTDIR}${PREFIX}/bin/ ${INSTALLDIR} ${DESTDIR}${PREFIX}/man/man1 ${INSTALLMAN} ${PROG}.1 ${DESTDIR}${PREFIX}/man/man1/ |