diff options
| author | Brian Anderson <andersrb@gmail.com> | 2012-10-03 12:15:48 -0700 |
|---|---|---|
| committer | Brian Anderson <andersrb@gmail.com> | 2012-10-03 12:15:48 -0700 |
| commit | 60c3f713b9cd2dcd707a72357c19e3464d0503dc (patch) | |
| tree | 2286ee0f011e3aa7933465328d6f19321574c482 | |
| parent | 73b2a932b76238fd3827f778495951af75cc815b (diff) | |
| parent | 27a984e254b224222415429b13b11b352fdf54e0 (diff) | |
Merge pull request #3644 from lucab/lucab/to-upstream/pull-1
Use both DESTDIR and prefix
| -rw-r--r-- | Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 25d44952444..a7594261c29 100644 --- a/Makefile.in +++ b/Makefile.in @@ -537,8 +537,8 @@ endif ifneq ($(findstring install,$(MAKECMDGOALS)),) ifdef DESTDIR - CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR)) - CFG_PREFIX:=$(DESTDIR) + CFG_INFO := $(info cfg: setting CFG_PREFIX via DESTDIR, $(DESTDIR)/$(CFG_PREFIX)) + CFG_PREFIX:=$(DESTDIR)/$(CFG_PREFIX) export CFG_PREFIX endif |