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

[Paul Sladen]

The following commit has been merged in the master branch:
commit fed458028cdc575527051af515b073e0acf43e60
Author: Paul Sladen <debian at paul.sladen.org>
Date:   Wed Jan 18 18:05:25 2012 +0100

    Move directory creation from 'debian/dirs' to 'debian/rules' (thanks to rfs-feedback)

diff --git a/debian/openbve.dirs b/debian/openbve.dirs
deleted file mode 100644
index 4618572..0000000
--- a/debian/openbve.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/openbve/
-usr/lib/openbve/
-usr/lib/openbve/Plugins
-usr/games
diff --git a/debian/rules b/debian/rules
index 35ef168..0a913e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,13 +32,16 @@ override_dh_clean:
 
 override_dh_install:
 	dh_install
+	# The wrapped is installed are here because the permissions need to be set
+	install -D -m 755 -T $(CURDIR)/debian/openbve.wrapper $(TARGET)/usr/games/openbve
+	# Moved creation from 'debian/dirs' to 'debian/rules' per sponsorship feedback	
+	install -d $(EXEC_TARGET) $(EXEC_PLUGIN_TARGET)
 	# NOTE: these are here, rather than in debian/*.install because it is not
-	# possible to switch between the setting of $(DEBUG_CONFIGURATION) otherwise
+	# possible to switch between the setting of \$(DEBUG_CONFIGURATION) otherwise
 	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)
 	install -m 755 $(CURDIR)/openBVE/OpenBveApi/bin/$(DEBUG_CONFIGURATION)/OpenBveApi.dll $(EXEC_TARGET)
 	install -m 644 $(CURDIR)/openBVE/OpenBveApi/bin/$(DEBUG_CONFIGURATION)/OpenBveApi.dll.mdb $(EXEC_TARGET)
-	install -m 755 -T $(CURDIR)/debian/openbve.wrapper $(TARGET)/usr/games/openbve
 	install -m 755 $(CURDIR)/openBVE/OpenBveAts/bin/$(DEBUG_CONFIGURATION)/OpenBveAts.dll $(EXEC_PLUGIN_TARGET)
 	install -m 755 $(CURDIR)/openBVE/Sound.Flac/bin/$(DEBUG_CONFIGURATION)/Sound.Flac.dll $(EXEC_PLUGIN_TARGET)
 	install -m 755 $(CURDIR)/openBVE/Sound.RiffWave/bin/$(DEBUG_CONFIGURATION)/Sound.RiffWave.dll $(EXEC_PLUGIN_TARGET)

-- 
openbve