On Mon, Oct 06, 2008 at 08:00:33AM -0700, Ben Pfaff wrote:
unknown-1 <[EMAIL PROTECTED]> writes:
>>The first is to fix the problem of it only works if unpacked on C:\msys,
>
> A partial work around could be if the installer patches the drive
character in
> the installation. So an end user can, at install time, decide wether it
is C:\
> msys D:\msys etc. Still no solution for networks etc, but it might work
for a
> lot of users. (I didn't check this!)
I really do think that --enable-relocatable is a full solution
for this.
I concurr.
If there are problems with it, then please do report
them and we will do our best to fix them.
I found two (minor) problems, one of which has already been
reported by Michel Boaventura. A patch is attached. I would commit
this, but I'm paranoid about touching the non-default branch since I
messed it up.
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.
diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index 6d5f50e..f68f2ad 100644 --- a/src/ui/gui/main.c +++ b/src/ui/gui/main.c @@ -20,6 +20,7 @@ #include "progname.h" #include <stdlib.h> #include <getopt.h> +#include <gl/relocatable.h> #include <libpspp/version.h> #include <libpspp/copyleft.h> @@ -45,7 +46,7 @@ create_splash_window (void) gtk_window_set_type_hint (GTK_WINDOW (splash), GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); - image = gtk_image_new_from_file (PKGDATADIR "/splash.png"); + image = gtk_image_new_from_file (relocate (PKGDATADIR "/splash.png")); gtk_container_add (GTK_CONTAINER (splash), image); diff --git a/tests/automake.mk b/tests/automake.mk index 2f876cf..0f7bdda 100644 --- a/tests/automake.mk +++ b/tests/automake.mk @@ -293,7 +293,7 @@ tests_dissect_sysfile_SOURCES = \ src/libpspp/float-format.c \ tests/dissect-sysfile.c tests_dissect_sysfile_LDADD = gl/libgl.la @LIBINTL@ -tests_dissect_sysfile_CFLAGS = $(AM_CFLAGS) +tests_dissect_sysfile_CFLAGS = $(AM_CFLAGS) -DINSTALLDIR=\"$(bindir)\" EXTRA_DIST += \ $(dist_TESTS) \
signature.asc
Description: Digital signature
_______________________________________________ pspp-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/pspp-dev
