diff --git a/distrib/autobuild.py b/distrib/autobuild.py index 6b14b77c15..20fb16b8f8 100755 --- a/distrib/autobuild.py +++ b/distrib/autobuild.py @@ -155,7 +155,7 @@ def update_changes(debChanges=False): # Also update the doomsday-fmod changelog (just version number). os.chdir(os.path.join(builder.config.DISTRIB_DIR, 'dsfmod')) - fmodVer = build_version.parse_header_for_version('../../doomsday/plugins/fmod/include/version.h') + fmodVer = build_version.parse_cmake_for_version('../../doomsday/cmake/Version.cmake') debVer = "%s.%s.%s-%s" % (fmodVer[0], fmodVer[1], fmodVer[2], todays_build_tag()) print "Marking new FMOD version:", debVer msg = 'New release: Doomsday Engine build %i.' % builder.Event().number() diff --git a/distrib/dsfmod/debian/rules b/distrib/dsfmod/debian/rules index 1b22296583..ac2248874e 100755 --- a/distrib/dsfmod/debian/rules +++ b/distrib/dsfmod/debian/rules @@ -4,7 +4,7 @@ builddir: mkdir -p builddir builddir/Makefile: builddir - cd builddir && qmake-qt4 PREFIX=/usr CONFIG+=release DENG_BUILD=`../../build_number.py --print` ../../../doomsday/plugins/fmod/fmod.pro + cd builddir && cmake -DCMAKE_BUILD_TYPE=Release -DDENG_BUILD=`../../build_number.py --print` ../../../doomsday/apps/plugins/fmod build: build-stamp @@ -28,7 +28,7 @@ install: build dh_installdirs # Add here commands to install the package into debian/your_appname - cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install + cd builddir && $(MAKE) DESTDIR=$(CURDIR)/debian/$(APPNAME) install # Build architecture-independent files here. binary-indep: build install