diff options
| author | Jack Lloyd <[email protected]> | 2017-08-07 11:46:50 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-08-07 11:46:50 -0400 |
| commit | 01317855dc2e076050277073ac40c308ad7a4da5 (patch) | |
| tree | f5b5dcc4589eace863f0cd872f81c0726afb82bf /src/build-data | |
| parent | 453fde9b740754b45b5820e0ad3bf1a836792718 (diff) | |
| parent | 53d1b0faf2d264e03933b2f1e578ff19c6209aa3 (diff) | |
Merge GH #1139 Replace --destdir flag with DESTDIR env variable
Diffstat (limited to 'src/build-data')
| -rw-r--r-- | src/build-data/makefile/gmake.in | 2 | ||||
| -rw-r--r-- | src/build-data/makefile/header.in | 2 | ||||
| -rw-r--r-- | src/build-data/makefile/nmake.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in index 70959dfa9..22e4ef778 100644 --- a/src/build-data/makefile/gmake.in +++ b/src/build-data/makefile/gmake.in @@ -75,4 +75,4 @@ docs: %{build_doc_commands} install: $(CLI) docs - $(SCRIPTS_DIR)/install.py --destdir=%{destdir} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} + $(SCRIPTS_DIR)/install.py --prefix=%{prefix} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in index f62f5ea0d..1114cf2d6 100644 --- a/src/build-data/makefile/header.in +++ b/src/build-data/makefile/header.in @@ -19,7 +19,7 @@ CLI_FLAGS = $(CXXFLAGS) $(WARN_FLAGS) TEST_FLAGS = $(CXXFLAGS) $(WARN_FLAGS) SCRIPTS_DIR = %{scripts_dir} -INSTALLED_LIB_DIR = %{destdir}/%{libdir} +INSTALLED_LIB_DIR = %{prefix}/%{libdir} CLI_POST_LINK_CMD = %{cli_post_link_cmd} TEST_POST_LINK_CMD = %{test_post_link_cmd} diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 2fc86e763..83d3e3f2b 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -100,4 +100,4 @@ distclean: clean $(RM) Makefile $(LIB_BASENAME).* $(CLI).* install: $(CLI) docs - $(SCRIPTS_DIR)\install.py --destdir=%{destdir} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} + $(SCRIPTS_DIR)\install.py --prefix=%{prefix} --build-dir="%{build_dir}" --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} |