Skip to content

Commit

Permalink
Revert "build: use $(prefix) instead of $(DESTDIR)"
Browse files Browse the repository at this point in the history
This reverts commit 90b1f08.

$(prefix) and $(DESTDIR) have different meanings. We're performing
a staged install, so $(DESTDIR) makes more sense.

Conflicts:
	Makefile
  • Loading branch information
kusma committed Jul 7, 2014
1 parent b8bcb15 commit be34be0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ NLDFLAGS = $(LDFLAGS)
all: bin bin/vc$X bin/vprof$X bin/vbcc$(TARGET)$X #bin/vcpp$X

install: all
$(INSTALL) -D bin/vc$X $(prefix)/bin/vc$X
$(INSTALL) -D bin/vprof$X $(prefix)/bin/vprof$X
$(INSTALL) -D bin/vbcc$(TARGET)$X $(prefix)/bin/vbcc$(TARGET)$X
$(INSTALL) -D bin/vc$X $(DESTDIR)/bin/vc$X
$(INSTALL) -D bin/vprof$X $(DESTDIR)/bin/vprof$X
$(INSTALL) -D bin/vbcc$(TARGET)$X $(DESTDIR)/bin/vbcc$(TARGET)$X

install-doc: doc/vbcc.pdf
$(INSTALL) -D doc/vbcc.pdf $(prefix)/share/doc/vbcc/vbcc.pdf
$(INSTALL) -D doc/vbcc.pdf $(DESTDIR)/share/doc/vbcc/vbcc.pdf

bin:
$(MKDIR) bin
Expand Down

0 comments on commit be34be0

Please sign in to comment.