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