CVS commit by mklingens: Workaround for the 'kconf_update looks in $kde_datadir, but binary programs do not belong there' problem: make kconf_update install a .sh that does the simple exec "`kde-config --prefix`/bin/kconf_update_bin/kopete-account-kconf_update" and install the binary in $(kde_bindir)/kconf_update_bin. I talked about this with Waldo and we agreed upon $(kde_bindir)/kconf_update (without '_bin' as suffix), but the kconf_update binary in kde_bindir has the same name, so that's not possible. And with irc.freenode.net resolving to 127.0.0.1 here there's no way I can verify my new location before commit. Hope it's ok. (*crosses fingers*) Waldo, is that ok for you to use as well in KDE 3.2's kconf_update? If not I'll change it to whatever you prefer instead... CCMAIL: bastian@kde.org A kopete-account-kconf_update.sh 1.1 M +8 -1 Makefile.am 1.3 M +2 -2 kopete-account-kconf_update.upd 1.2 --- kdenonbeta/kopete/kopete/kconf_update/Makefile.am #1.2:1.3 @@ -2,6 +2,13 @@ update_DATA = kopete-account-kconf_update.upd -update_PROGRAMS = kopete-account-kconf_update +update_SCRIPTS = kopete-account-kconf_update.sh updatedir = $(kde_datadir)/kconf_update + +# The Qt app cannot go into kde_datadir, that is not portable. +# install to kde_bindir/kconf_update_bin instead. +# KDE 3.2 will allow kconf_update scripts to run directly from there, +# but for us that's too late. Use the .sh script as a workaround. +kconf_PROGRAMS = kopete-account-kconf_update +kconfdir = $(kde_bindir)/kconf_update_bin kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp --- kdenonbeta/kopete/kopete/kconf_update/kopete-account-kconf_update.upd #1.1:1.2 @@ -1,4 +1,4 @@ -Id=kopete0.7/r2 +Id=kopete0.7/r1 File=kopeterc -Script=kopete-account-kconf_update +Script=kopete-account-kconf_update.sh,sh