Skip to content

Commit b6c230b

Browse files
committed
Merge pull request #29 from cicku/patch-1
Merged. Thanks !
2 parents ba51282 + a09df1e commit b6c230b

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

Makefile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
OBJ=cv
2-
CFLAGS+=-g -Wall -D_FILE_OFFSET_BITS=64
3-
LFLAGS=-lncurses -lm
4-
PREFIX = $(DESTDIR)/usr/local
1+
OBJ = cv
2+
override CFLAGS += -g -Wall -D_FILE_OFFSET_BITS=64
3+
override LFLAGS += -lncurses -lm
4+
PREFIX ?= /usr/local
55
BINDIR = $(PREFIX)/bin
6+
MANDIR = $(PREFIX)/share/man/man1
67

78
$(OBJ) : cv.o sizes.o hlist.o
89
$(CC) -Wall $^ -o $@ $(LFLAGS)
@@ -11,7 +12,11 @@ $(OBJ) : cv.o sizes.o hlist.o
1112
clean :
1213
rm -f *.o $(OBJ)
1314
install : $(OBJ)
14-
@echo "Installing to $(BINDIR) ..."
15-
@mkdir -p $(BINDIR)
16-
@install -m 0755 $(OBJ) $(BINDIR)/$(TARGET) || \
15+
@echo "Installing program to $(DESTDIR)$(BINDIR) ..."
16+
@mkdir -p $(DESTDIR)$(BINDIR)
17+
@install -pm0755 $(OBJ) $(DESTDIR)$(BINDIR)/$(TARGET) || \
18+
echo "Failed. Try "make PREFIX=~ install" ?"
19+
@echo "Installing manpage to $(DESTDIR)$(MANDIR) ..."
20+
@mkdir -p $(DESTDIR)$(MANDIR)
21+
@install -pm0644 cv.1 $(DESTDIR)$(MANDIR)/ || \
1722
echo "Failed. Try "make PREFIX=~ install" ?"

0 commit comments

Comments
 (0)