summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Kreen2010-06-23 13:35:33 +0000
committerMarko Kreen2010-06-23 13:35:33 +0000
commit72a0c448387e969966fa32d54c5cde7c35ff603b (patch)
tree0be286b2909a7c8e857ca7e7e96980ea3d244152
parentbd00ea2953934375293bf18462e4339ded1c9fd8 (diff)
Fix double install on debian.
-rw-r--r--Makefile1
-rw-r--r--debian/packages.in4
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9af38b43..a19efaba 100644
--- a/Makefile
+++ b/Makefile
@@ -53,6 +53,7 @@ modules-install: config.mak
python-install: config.mak sub-all
mkdir -p $(DESTDIR)/$(bindir)
$(PYTHON) setup_pkgloader.py install --prefix=$(prefix) --root=$(DESTDIR)/
+ find build -name 'pkgloader*' | xargs rm
$(PYTHON) setup_skytools.py install --prefix=$(prefix) --root=$(DESTDIR)/ --record=tmp_files.lst \
--install-lib=$(prefix)/lib/python$(pyver)/site-packages/skytools-3.0
for s in $(SFX_SCRIPTS); do \
diff --git a/debian/packages.in b/debian/packages.in
index 2682a6be..70c1b50f 100644
--- a/debian/packages.in
+++ b/debian/packages.in
@@ -11,8 +11,8 @@ Copyright: BSD
Build: sh
PATH=/usr/lib/postgresql/PGVER/bin:$PATH \
./configure --prefix=/usr --with-pgconfig=/usr/lib/postgresql/PGVER/bin/pg_config --with-asciidoc
- PATH=/usr/lib/postgresql/PGVER/bin:$PATH \
- make DESTDIR=$ROOT
+ #PATH=/usr/lib/postgresql/PGVER/bin:$PATH \
+ #make DESTDIR=$ROOT
Clean: sh
PATH=/usr/lib/postgresql/PGVER/bin:$PATH \
make distclean || make clean || true