From 0a94e7271c75a41b9336533e738fa91f351a7283 Mon Sep 17 00:00:00 2001 From: Claudio Matsuoka <cmatsuoka@gmail.com> Date: Tue, 11 Jan 2011 18:55:30 -0200 Subject: [PATCH] Fix directory creation in install target Also move man6 out of MANDIR to keep compatibility with modern canonical usage of installation variables in Linux. Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com> --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2591070..b0c4321 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ LDFLAGS = BINDIR = /usr/local/bin # Where the man page should be put -MANDIR = /usr/local/man/man6 +MANDIR = /usr/local/man # Where figlet will search first for fonts (the ".flf" files). DEFAULTFONTDIR = /usr/local/share/figlet @@ -59,7 +59,7 @@ MAN = figlet.6 $(CC) -c $(CFLAGS) -DDEFAULTFONTDIR=\"$(DEFAULTFONTDIR)\" \ -DDEFAULTFONTFILE=\"$(DEFAULTFONTFILE)\" -o $*.o $< -all: figlet chkfont +all: $(BINS) figlet: $(OBJS) $(LD) $(LDFLAGS) -o $@ $(OBJS) @@ -70,10 +70,12 @@ chkfont: chkfont.o clean: rm -f *.o *~ core figlet chkfont -install: $(BINS) +install: all + mkdir -p $(DESTDIR)$(BINDIR) + mkdir -p $(DESTDIR)$(MANDIR)/man6 mkdir -p $(DESTDIR)$(DEFAULTFONTDIR) cp $(BINS) $(DESTDIR)$(BINDIR) - cp $(MAN) $(DESTDIR)$(MANDIR) + cp $(MAN) $(DESTDIR)$(MANDIR)/man6 cp fonts/*.flf $(DEFAULTFONTDIR) cp fonts/*.flc $(DEFAULTFONTDIR)