From 5cbf2a937d65cf9308906108a1a109f624800f30 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 17 Jan 2013 12:53:51 +0100 Subject: [PATCH] this produces a non-empty packagea at last --- Makefile | 6 +++--- Makefile.debian | 2 +- debian/rules | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 4c148c99..97d58086 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ # # overwritten by the specfile DESTDIR="/" - +PREFIX=/usr ########## all: python wsdl @@ -29,12 +29,12 @@ sfa/util/version.py: sfa/util/version.py.in sed -e "s,@VERSIONTAG@,$(VERSIONTAG),g" -e "s,@SCMURL@,$(SCMURL),g" sfa/util/version.py.in > $@ xmlbuilder-install: - cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd - + cd xmlbuilder-0.9 && python setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) && cd - rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info # postinstall steps - various cleanups and tweaks for a nicer rpm python-install: - python setup.py install --root=$(DESTDIR) + python setup.py install --prefix=$(PREFIX) --root=$(DESTDIR) chmod 444 $(DESTDIR)/etc/sfa/default_config.xml rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/sfa/storage/migrations diff --git a/Makefile.debian b/Makefile.debian index 078c9376..4ac9c58d 100644 --- a/Makefile.debian +++ b/Makefile.debian @@ -15,7 +15,7 @@ debian.source: force rsync -a $(TARBALL) $(DEBIAN_TARBALL) debian.package: - debuild -uc -us --source-option=--include-binaries --source-option=-isession + debuild -uc -us -b debian.clean: $(MAKE) -f debian/rules clean diff --git a/debian/rules b/debian/rules index f1efaacf..b8796e6e 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,3 @@ %: dh $@ - -override_dh_auto_install: - $(MAKE) DESTDIR=$$(pwd)/debian/hithere install -- 2.43.0