summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2010-11-03 15:57:33 +0000
committerMarko Kreen2010-11-03 15:57:33 +0000
commit93e4623cea82da0c469bd7848f0ede38f1c3f94d (patch)
tree1a5b7015e3cb0c096a03455a027a0d5edfcdd091
parent845ec3ee641802343dd325ab48448a91182c6e39 (diff)
Restore old compat package location.
Workaround for broken debian broke it, needs bit different owrkaround later.
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ce4589d0..8426b073 100644
--- a/Makefile
+++ b/Makefile
@@ -53,12 +53,16 @@ modules-install: config.mak
$(MAKE) -C sql install DESTDIR=$(DESTDIR)
test \! -d compat || $(MAKE) -C compat $@ DESTDIR=$(DESTDIR)
+SITEDIR = site-packages
+
python-install: config.mak sub-all
mkdir -p $(DESTDIR)/$(bindir)
rm -rf build
$(PYTHON) setup_pkgloader.py install --prefix=$(prefix) --root=$(DESTDIR)/ $(BROKEN_PYTHON)
find build -name 'pkgloader*' | xargs rm
- $(PYTHON) setup_skytools.py install --prefix=$(prefix) --root=$(DESTDIR)/ $(BROKEN_PYTHON) --record=tmp_files.lst
+ $(PYTHON) setup_skytools.py install --prefix=$(prefix) --root=$(DESTDIR)/ \
+ --install-lib=$(prefix)/lib/python$(pyver)/$(SITEDIR)/skytools-3.0 \
+ --record=tmp_files.lst
for s in $(SFX_SCRIPTS); do \
exe=`echo $$s|sed -e 's!.*/!!' -e 's/[.]py//'`; \
install $$s $(DESTDIR)/$(bindir)/$${exe}$(SCRIPT_SUFFIX) || exit 1; \