| Richard Marian Thomaiyar | 14fddef | 2018-07-13 23:55:56 +0530 | [diff] [blame] | 1 | [PATCH] redefine the python library install dir |
| 2 | |
| 3 | Upstream-Status: Pending |
| 4 | |
| 5 | If install-lib is not defined, it is always /usr/lib/, but it |
| 6 | maybe /usr/lib64 for multilib |
| 7 | |
| 8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 9 | --- |
| 10 | Makefile.in | 4 ++-- |
| 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 12 | |
| 13 | diff --git a/Makefile.in b/Makefile.in |
| 14 | index 1bb062c..cced2fb 100644 |
| 15 | --- a/Makefile.in |
| 16 | +++ b/Makefile.in |
| 17 | @@ -311,7 +311,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py |
| 18 | |
| 19 | install-zenmap: $(ZENMAPDIR)/setup.py |
| 20 | $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 |
| 21 | - cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") |
| 22 | + cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --force $(if $(DESTDIR),--root "$(DESTDIR)") |
| 23 | $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ |
| 24 | # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is |
| 25 | # already a link. |
| 26 | @@ -328,7 +328,7 @@ build-nping: $(NPINGDIR)/Makefile nbase_build nsock_build netutil_build $(NPINGD |
| 27 | @cd $(NPINGDIR) && $(MAKE) |
| 28 | |
| 29 | install-ndiff: |
| 30 | - cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") |
| 31 | + cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") |
| 32 | |
| 33 | NSE_FILES = scripts/script.db scripts/*.nse |
| 34 | NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc |
| 35 | -- |
| 36 | 1.9.1 |
| 37 | |