From: Ben Pfaff Date: Mon, 21 Jul 2008 22:44:18 +0000 (-0700) Subject: Do the Debian package build in a _debian subdirectory. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88b554881b1fc6dc6ec0ed029e3518c9e1151f3f;p=openvswitch Do the Debian package build in a _debian subdirectory. This makes it easier to do a Debian build in the same source tree also being used for other development. --- diff --git a/debian/openflow-common.install b/debian/openflow-common.install index 4175c301..624bc344 100644 --- a/debian/openflow-common.install +++ b/debian/openflow-common.install @@ -1,2 +1,2 @@ -utilities/ofp-pki usr/sbin -utilities/vlogconf usr/sbin +_debian/utilities/ofp-pki usr/sbin +_debian/utilities/vlogconf usr/sbin diff --git a/debian/openflow-common.manpages b/debian/openflow-common.manpages index 282ec329..ee20d1ea 100644 --- a/debian/openflow-common.manpages +++ b/debian/openflow-common.manpages @@ -1,2 +1,2 @@ utilities/vlogconf.8 -utilities/ofp-pki.8 +_debian/utilities/ofp-pki.8 diff --git a/debian/openflow-controller.install b/debian/openflow-controller.install index 75ab4356..3932ab6a 100644 --- a/debian/openflow-controller.install +++ b/debian/openflow-controller.install @@ -1 +1 @@ -controller/controller usr/sbin +_debian/controller/controller usr/sbin diff --git a/debian/openflow-controller.manpages b/debian/openflow-controller.manpages index c30c912b..3fbaaeaf 100644 --- a/debian/openflow-controller.manpages +++ b/debian/openflow-controller.manpages @@ -1 +1 @@ -controller/controller.8 +_debian/controller/controller.8 diff --git a/debian/openflow-pki.install b/debian/openflow-pki.install index 58cfb4e9..cd530ca4 100644 --- a/debian/openflow-pki.install +++ b/debian/openflow-pki.install @@ -1 +1 @@ -utilities/ofp-pki-cgi usr/lib/cgi-bin +_debian/utilities/ofp-pki-cgi usr/lib/cgi-bin diff --git a/debian/openflow-switch.install b/debian/openflow-switch.install index 96db7278..77ea13af 100644 --- a/debian/openflow-switch.install +++ b/debian/openflow-switch.install @@ -1,4 +1,4 @@ -switch/switch usr/sbin -secchan/secchan usr/sbin -utilities/dpctl usr/sbin +_debian/switch/switch usr/sbin +_debian/secchan/secchan usr/sbin +_debian/utilities/dpctl usr/sbin debian/ofp-switch-setup usr/sbin diff --git a/debian/openflow-switch.manpages b/debian/openflow-switch.manpages index 905d0606..9f4c4ff8 100644 --- a/debian/openflow-switch.manpages +++ b/debian/openflow-switch.manpages @@ -1,4 +1,4 @@ debian/ofp-switch-setup.8 -secchan/secchan.8 -switch/switch.8 +_debian/secchan/secchan.8 +_debian/switch/switch.8 utilities/dpctl.8 diff --git a/debian/rules b/debian/rules index ab44b77f..d7300e6f 100755 --- a/debian/rules +++ b/debian/rules @@ -29,8 +29,10 @@ configure: configure-stamp configure-stamp: dh_testdir test -e configure || ./boot.sh - test -e Makefile || \ - ./configure --prefix=/usr --localstatedir=/var --enable-ssl + test -d _debian || mkdir _debian + cd _debian && ( \ + test -e Makefile || \ + ../configure --prefix=/usr --localstatedir=/var --enable-ssl) touch configure-stamp #Architecture @@ -38,18 +40,19 @@ build: build-arch build-indep build-arch: build-arch-stamp build-arch-stamp: configure-stamp - $(MAKE) + $(MAKE) -C _debian touch $@ build-indep: build-indep-stamp build-indep-stamp: configure-stamp - $(MAKE) dist distdir=openflow + $(MAKE) -C _debian dist distdir=openflow touch $@ clean: dh_testdir dh_testroot rm -f build-arch-stamp build-indep-stamp configure-stamp + rm -rf _debian [ ! -f Makefile ] || $(MAKE) distclean dh_clean debconf-updatepo @@ -97,7 +100,7 @@ install-indep: build-indep dh_testroot dh_clean -k -i dh_installdirs -i - cp openflow.tar.gz $(MODDIR) + cp _debian/openflow.tar.gz $(MODDIR) cd debian; cp changelog control compat *.modules.in rules $(MODDIR)/debian cd debian/openflow-datapath-source/usr/src && tar -c modules | bzip2 -9 > openflow-datapath.tar.bz2 && rm -rf modules install -m644 debian/openflow-pki.apache2 debian/openflow-pki/etc/apache2/sites-available/openflow-pki @@ -108,7 +111,7 @@ install-arch: build-arch dh_testroot dh_clean -k -s dh_installdirs -s - $(MAKE) DESTDIR=$(CURDIR)/debian/openflow install + $(MAKE) -C _debian DESTDIR=$(CURDIR)/debian/openflow install cp debian/openflow-switch.overrides debian/openflow-switch/usr/share/lintian/overrides/openflow-switch dh_install -s