From 72a0c448387e969966fa32d54c5cde7c35ff603b Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Wed, 23 Jun 2010 16:35:33 +0300 Subject: [PATCH] Fix double install on debian. --- Makefile | 1 + debian/packages.in | 4 ++-- 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 -- 2.39.5