[rkward-cvs] SF.net SVN: rkward:[2414] trunk/rkward/debian

[tfry at users.sourceforge.net]

Revision: 2414
          http://rkward.svn.sourceforge.net/rkward/?rev=2414&view=rev
Author:   tfry
Date:     2009-03-26 20:32:28 +0000 (Thu, 26 Mar 2009)

Log Message:
-----------
Try to cope with Debian/Ubuntu differences (thanks to Meik)

Modified Paths:
--------------
    trunk/rkward/debian/changelog
    trunk/rkward/debian/rules

Modified: trunk/rkward/debian/changelog
===================================================================
--- trunk/rkward/debian/changelog	2009-03-25 16:19:37 UTC (rev 2413)
+++ trunk/rkward/debian/changelog	2009-03-26 20:32:28 UTC (rev 2414)
@@ -1,4 +1,4 @@
-rkward (0.5.0c-1) unstable; urgency=low
+rkward (0.5.0c-test2-1) unstable; urgency=low
 
   * new upstream release
     closes: #520969

Modified: trunk/rkward/debian/rules
===================================================================
--- trunk/rkward/debian/rules	2009-03-25 16:19:37 UTC (rev 2413)
+++ trunk/rkward/debian/rules	2009-03-26 20:32:28 UTC (rev 2414)
@@ -13,6 +13,15 @@
 #we need to know the R version
 RVERS = $(shell dpkg-query -W --showformat='$${Version}' r-base-core) 
 
+# Check for location of kde4 installation. Debian and Ubuntu currently
+# use different paths. We want to be compatible with both.
+KDE4ALT = $(shell test -d /usr/lib/kde4/share/kde4 && echo TRUE)
+ifdef KDE4ALT
+	KDE4INST = /usr/lib/kde4
+else
+	KDE4INST = /usr
+endif
+
 CFLAGS = -Wall -g
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -34,9 +43,9 @@
 	F77="`/usr/bin/R CMD config F77`" \
 	cmake .. \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DDATA_INSTALL_DIR=/usr/share/kde4/apps \
-		-DHTML_INSTALL_DIR=/usr/share/doc/kde4/HTML \
-		-DKCFG_INSTALL_DIR=/usr/share/kde4/config.kcfg \
+		-DDATA_INSTALL_DIR=$(KDE4INST)/share/kde4/apps \
+		-DHTML_INSTALL_DIR=$(KDE4INST)/share/doc/kde4/HTML \
+		-DKCFG_INSTALL_DIR=$(KDE4INST)/share/kde4/config.kcfg \
 		-DINFO_INSTALL_DIR=/usr/share/info \
 		-DMAN_INSTALL_DIR=/usr/share/man \
 		-DKDE_DEFAULT_HOME=.kde4 \
@@ -80,7 +89,9 @@
 	# Add here commands to install the package into debian/rkward.
 	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/rkward
 	# dirty hack to get rid of conflicting r.xml file without adjusting all makefiles
-	rm -vf $(CURDIR)/debian/rkward/usr/share/apps/katepart/syntax/r.xml
+	rm -vf $(CURDIR)/debian/rkward/$(KDE4INST)/share/apps/katepart/syntax/r.xml
+	# May be in different locations Debian / Ubuntu
+	rm -vf $(CURDIR)/debian/rkward/$(KDE4INST)/share/kde4/apps/katepart/syntax/r.xml
 	
 	# remove unneeded R package files
 	rm -vf $(CURDIR)/debian/rkward/usr/lib/R/site-library/R.css $(CURDIR)/debian/rkward/usr/lib/R/site-library/rkward/COPYING


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.