Skip to content

Commit

Permalink
Merge master branch with lib
Browse files Browse the repository at this point in the history
  • Loading branch information
moogle19 committed Apr 30, 2016
2 parents 035747a + 11658ff commit 6538110
Show file tree
Hide file tree
Showing 11 changed files with 1,374 additions and 1,329 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PREFIX?= /usr/local

MAN=
BINDIR=$(PREFIX)/sbin
#FILESDIR=$(PREFIX)/lib/iohyve
FILESDIR=$(PREFIX)/lib/iohyve
RCDIR=$(PREFIX)/etc/rc.d
MANDIR=$(PREFIX)/man/man8
MKDIR=mkdir
Expand All @@ -21,9 +21,9 @@ ${SCRIPTS}:
install:: all
$(MKDIR) -p $(BINDIR)
$(MKDIR) -p $(RCDIR)
# $(MKDIR) -p $(FILESDIR)
$(MKDIR) -p $(FILESDIR)
$(INSTALL) -c -m $(BINMODE) ${.OBJDIR}/$(SCRIPTS) $(BINDIR)/
# $(INSTALL) -c ${.OBJDIR}/lib/* $(FILESDIR)/
$(INSTALL) -c ${.OBJDIR}/lib/* $(FILESDIR)/
$(INSTALL) -c ${.OBJDIR}/rc.d/* $(RCDIR)/
$(INSTALL) -c $(MAN).gz $(MANDIR)/

Expand Down
Loading

0 comments on commit 6538110

Please sign in to comment.