[Pkg-cli-apps-commits] [SCM] openbve-data branch, master, updated. 1794a57708cdb57ebcd27299d26018ccd18361c0

[Paul Sladen]

The following commit has been merged in the master branch:
commit d14b0e1e183826278821ec8d84efeecc4b0c45b2
Author: Paul Sladen <sladen at ubuntu.com>
Date:   Sun Jan 8 23:26:25 2012 +0100

    make Data/Plugins removal not an error condition

diff --git a/debian/rules b/debian/rules
index 2419a89..2859ff8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 export DH_VERBOSE=15
 TARGET = $(CURDIR)/debian/openbve-data
-DATATARGET=$(TARGET)/usr/share/games/openbve/
+DATATARGET=$(TARGET)/usr/share/games/openbve
 
 configure: configure-stamp
 configure-stamp:
@@ -28,7 +28,7 @@ install: build
 	cp -rp $(CURDIR)/Data $(DATATARGET)/
 	(cd $(TARGET)/usr/share/pixmaps/ && ln -s ../games/openbve/Data/Menu/logo.png openbve.128.png)
 	# This package is contextual data, not plugin-executables
-	rmdir $(DATATARGET)/Data/Plugins
+	-rmdir $(DATATARGET)/Data/Plugins
 
 binary-arch:
 	# Do nothing

-- 
openbve-data