[rkward-devel] a patch

[meik michalke]

hi,

am Donnerstag, 26. März 2009 (22:13) schrieb Thomas Friedrichsmeier:
> Once again, it would be great, if you could test on various flavors of
> Ubuntu, to see if this really fixes all problems.

i can confirm that -test2 compiles, installs and runs on ubuntu 8.04. but... i 
tried to build a .deb on ubuntu 8.10 as well and noticed that the kde4 path 
checking didn't work :-/ "ifdef" returns true, no matter what.

line 19 needs to be changed to ifeq, then it works:

<patch>
diff -Naur rkward-0.5.0c-test2.orig/debian/rules 
rkward-0.5.0c-test2/debian/rules
--- rkward-0.5.0c-test2.orig/debian/rules  2009-03-27 10:49:46.000000000 +0100
+++ rkward-0.5.0c-test2/debian/rules  2009-03-27 10:51:51.000000000 +0100
@@ -16,7 +16,7 @@
 # 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
+ifeq ($(KDE4ALT),TRUE)
        KDE4INST = /usr/lib/kde4
 else
        KDE4INST = /usr
</patch>

sorry for that...

> > [btw, is there a more elegant way of checking for directories and setting
> > a variable than i've used?]
>
> It is always a pain in those makefiles.

yes it is -- s.o.! :-D

> I simplified the second portion of your patch a bit, though.

ok, that was the "dirty hack" area anyway ;-)


viele grüße :: m.eik

-- 
dipl. psych. meik michalke
institut f"ur experimentelle psychologie
abt. f"ur diagnostik und differentielle psychologie
heinrich-heine-universit"at d"usseldorf
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/rkward-devel/attachments/20090327/589c7eb5/attachment.sig>