From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 7 Oct 2008 11:40:56 +0000 (+0800)
Subject: Fixed problems when building with --enable-relocatable
X-Git-Tag: v0.6.1~1
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=f61eb021e40f2fdf82bb93b6525189b46cbc977a;p=pspp-builds.git

Fixed problems when building with --enable-relocatable

Added the INSTALLDIR macro to tests/dissect-sysfile.
Relocated the pathname of the splash screen graphic.
---

diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index a3d39461..eca3f98f 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 6fb11d02..bfca93d4 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -270,6 +270,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_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
 
 EXTRA_DIST += \
 	$(dist_TESTS) \