diff options
| author | git <[email protected]> | 2015-01-11 22:33:41 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2015-01-11 22:33:41 +0000 |
| commit | 8f908683f175a4093acf1d90fa0d054ee3c5bd56 (patch) | |
| tree | f2fd2f49b7cca0ba8b27ea1cf18a2092d99efce3 /src/build-data/makefile | |
| parent | fa3ceda74abf0c5c38f6099844066f3465de1951 (diff) | |
Fixes for Windows paths. Based on Github pull 41 from cdesjardins
with some modifications by randombit.
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 | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/build-data/makefile/gmake.in b/src/build-data/makefile/gmake.in index be8947cf1..86d2d3569 100644 --- a/src/build-data/makefile/gmake.in +++ b/src/build-data/makefile/gmake.in @@ -60,7 +60,7 @@ distclean: clean docs: %{build_doc_commands} -install: $(LIBRARIES) docs +install: $(APP) docs $(SCRIPTS_DIR)/install.py --destdir=%{destdir} --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} website: diff --git a/src/build-data/makefile/header.in b/src/build-data/makefile/header.in index d01b8a28a..6594cab69 100644 --- a/src/build-data/makefile/header.in +++ b/src/build-data/makefile/header.in @@ -16,7 +16,7 @@ LIB_FLAGS = $(SO_OBJ_FLAGS) $(LANG_FLAGS) $(LIB_OPT) $(WARN_FLAGS) APP_FLAGS = $(LANG_FLAGS) $(APP_OPT) $(WARN_FLAGS) TEST_FLAGS = $(LANG_FLAGS) $(APP_OPT) $(WARN_FLAGS) -SCRIPTS_DIR = src/scripts +SCRIPTS_DIR = %{scripts_dir} # Version Numbers VERSION = %{version} diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 6ce3a536e..8359a1eb6 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -72,5 +72,5 @@ distclean: clean $(RMDIR) %{build_dir} $(RM) Makefile $(LIBNAME).* $(APP).* -install: $(LIBRARIES) docs - $(SCRIPTS_DIR)/install.py --destdir=%{destdir} --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} +install: $(APP) docs + $(SCRIPTS_DIR)\install.py --destdir=%{destdir} --bindir=%{bindir} --libdir=%{libdir} --docdir=%{docdir} --includedir=%{includedir} |