CVS commit by ach: Fix rules so debuild works in extragear environment
M +18 -7 rules 1.5 --- kdeextragear-3/kdebluetooth/debian/rules #1.4:1.5 @@ -12,10 +12,20 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq "$(wildcard ./admin)" "" + # Builds in kdeextragear-3 + CVS_BUILD=true + deb_cfg_dir=.. + deb_src_dir=. +else + # ./admin exists -> build outside kdeextragear-3 + deb_cfg_dir=. + deb_src_dir=kdebluetooth +endif + -include debian/debiandirs -debian/debiandirs: admin/debianrules - perl -w admin/debianrules echodirs > debian/debiandirs +debian/debiandirs: $(deb_cfg_dir)/admin/debianrules + perl -w $(deb_cfg_dir)/admin/debianrules echodirs > debian/debiandirs -CVS_BUILD=true ifneq (, $(findstring true,$(CVS_BUILD))) configkde += --enable-debug=full @@ -38,5 +48,5 @@ # # # run configure with build tree $(objdir) - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) + cd $(deb_cfg_dir) && ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) $(configkde) touch configure-stamp @@ -61,12 +71,13 @@ dh_testroot rm -f build-stamp configure-stamp + rm -f debian/debianrules # Add here commands to clean up after the build process. -$(MAKE) distclean ifneq "$(wildcard /usr/share/misc/config.sub)" "" - cp -f /usr/share/misc/config.sub config.sub + cp -f /usr/share/misc/config.sub $(deb_cfg_dir)/config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" - cp -f /usr/share/misc/config.guess config.guess + cp -f /usr/share/misc/config.guess $(deb_cfg_dir)/config.guess endif @@ -92,5 +103,5 @@ dh_testdir dh_testroot - dh_installchangelogs ChangeLog + dh_installchangelogs $(deb_src_dir)/ChangeLog dh_installdocs dh_installexamples