diff options
| author | Zoltan Gyarmati <[email protected]> | 2017-07-05 02:24:12 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2017-08-04 11:49:13 +0200 |
| commit | f09289c293807e51dfd3e4b5fff5a4d48d75f754 (patch) | |
| tree | 1ab1039e51297fbb9e69e02061fe7a1f425a2715 /src/build-data/makefile | |
| parent | 8a29dc8209c6e93581075bbc4c39ff5bf0cdace5 (diff) | |
Turn --destdir option into an environment variable, fixes #1101, fixes #996, supersedes #997
This commit removes the (broken) --destdir command line option and introduces
the DESTDIR environment variable for the 'make install' target. When it's set,
the installation will take place in the DESTDIR directory, under the prefix set
by --prefix, with all of the internal references (pkgconfig file, etc)
containing only the prefix. This behavior is more standard (as in autotools and
co.), so makes packaging easier.
Based on work of danimo and zgyarmati
Diffstat (limited to 'src/build-data/makefile')
| -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} |