[Pkg-cli-apps-commits] [SCM] openbve branch, master, updated. debian/1.4.0.0-1-6-geeabb22

[Paul Sladen]

The following commit has been merged in the master branch:
commit eeabb223e373d0653b4cc3ca96d1e376c4c9cf4d
Author: Paul Sladen <debian at paul.sladen.org>
Date:   Sat Jan 14 10:44:41 2012 +0100

    use override_dh_auto_build correctly (Thanks to Laney)

diff --git a/debian/rules b/debian/rules
index 6fe5879..4359123 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,8 +17,7 @@ DEBUG_CONFIGURATION=Release
 override_dh_clideps:
 	dh_clideps --exclude-moduleref=AtsPluginProxy --exclude-moduleref=AtsPluginProxy.dll
 
-# It works, but only because of the kludge below
-override_dh_build-indep:
+override_dh_auto_build:
 	for builddir in $(BUILDDIRS); do \
 	  (cd $$builddir && xbuild /p:Configuration=$(DEBUG_CONFIGURATION) *.csproj) || exit 1; \
 	done
@@ -31,8 +30,7 @@ override_dh_clean:
 	  rm -rf $$builddir/bin $$builddir/obj; \
 	done
 
-# kludge: can't get it to build without the forced 'build-indep' dependency
-override_dh_install: override_dh_build-indep
+override_dh_install:
 	dh_install
 	install -m 755 $(CURDIR)/openBVE/OpenBve/bin/$(DEBUG_CONFIGURATION)/OpenBve.exe $(EXEC_TARGET)
 	#install -m 644 $(CURDIR)/openBVE/OpenBve/bin/$(DEBUG_CONFIGURATION)/OpenBve.exe.mdb $(EXEC_TARGET)

-- 
openbve