[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp .cvsignore Smake po/de.po po/pspp.pot src/...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp .cvsignore Smake po/de.po po/pspp.pot src/... |
|
Date: |
Mon, 26 Mar 2007 10:11:01 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/03/26 10:11:01
Modified files:
. : .cvsignore Smake
po : de.po pspp.pot
src/ui/gui : about.c automake.mk data-editor.c helper.h
psppire.c syntax-editor.c transpose-dialog.c
var-sheet.c weight-cases-dialog.c
window-manager.c
src/ui/terminal: automake.mk main.c
Log message:
Made the code relocatable (using the relocate function from gnulib).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/.cvsignore?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/Smake?cvsroot=pspp&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/about.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/helper.h?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire.c?cvsroot=pspp&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/syntax-editor.c?cvsroot=pspp&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/transpose-dialog.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-sheet.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/weight-cases-dialog.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/window-manager.c?cvsroot=pspp&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/automake.mk?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/main.c?cvsroot=pspp&r1=1.31&r2=1.32
Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/pspp/pspp/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- .cvsignore 25 Feb 2007 05:14:58 -0000 1.5
+++ .cvsignore 26 Mar 2007 10:11:01 -0000 1.6
@@ -27,3 +27,6 @@
pref.h
stamp-h1
texinfo.tex
+config.libpath
+install-reloc
+reloc-ldflags
Index: Smake
===================================================================
RCS file: /sources/pspp/pspp/Smake,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- Smake 19 Mar 2007 20:51:01 -0000 1.53
+++ Smake 26 Mar 2007 10:11:01 -0000 1.54
@@ -35,6 +35,7 @@
minmax \
mkstemp \
progname \
+ relocatable-prog \
snprintf \
stdarg \
stdbool \
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- po/de.po 19 Mar 2007 20:51:02 -0000 1.41
+++ po/de.po 26 Mar 2007 10:11:01 -0000 1.42
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-03-19 13:38-0700\n"
+"POT-Creation-Date: 2007-03-25 18:00+0800\n"
"PO-Revision-Date: 2006-05-26 17:49+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -1367,20 +1367,6 @@
"Data fields must be listed in order of increasing record number."
msgstr ""
-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/data-io/print.c:260
#, c-format
msgid "Output calls for %d records but %u specified on RECORDS subcommand."
@@ -1400,6 +1386,20 @@
msgstr[0] ""
msgstr[1] ""
+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/dictionary/apply-dictionary.c:74
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -3018,22 +3018,6 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-
#: src/language/stats/npar.q:101
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3058,6 +3042,22 @@
"match the number following (%d)."
msgstr ""
+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -4601,18 +4601,6 @@
msgid "%d"
msgstr ""
-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr "Keine"
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr "Spezial"
-
#: src/ui/gui/psppire.glade:9
#, fuzzy
msgid "This is pre-alpha software. Use at your own risk."
@@ -4663,6 +4651,18 @@
msgid "Variable(s):"
msgstr "Variableansicht"
+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr "Keine"
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr "Spezial"
+
#: src/ui/gui/sort-cases-dialog.c:367
msgid "Criteria"
msgstr ""
@@ -4832,7 +4832,7 @@
"Report bugs to <%s>.\n"
msgstr ""
-#: src/ui/terminal/main.c:132
+#: src/ui/terminal/main.c:133
msgid ""
"Stopping syntax file processing here to avoid a cascade of dependent command "
"failures."
Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- po/pspp.pot 19 Mar 2007 20:51:02 -0000 1.125
+++ po/pspp.pot 26 Mar 2007 10:11:01 -0000 1.126
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-03-19 13:38-0700\n"
+"POT-Creation-Date: 2007-03-25 18:00+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -1362,20 +1362,6 @@
"Data fields must be listed in order of increasing record number."
msgstr ""
-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/data-io/print.c:260
#, c-format
msgid "Output calls for %d records but %u specified on RECORDS subcommand."
@@ -1395,6 +1381,20 @@
msgstr[0] ""
msgstr[1] ""
+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/dictionary/apply-dictionary.c:74
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -3012,22 +3012,6 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-
#: src/language/stats/npar.q:101
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3052,6 +3036,22 @@
"match the number following (%d)."
msgstr ""
+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -4578,18 +4578,6 @@
msgid "%d"
msgstr ""
-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr ""
-
#: src/ui/gui/psppire.glade:9
msgid "This is pre-alpha software. Use at your own risk."
msgstr ""
@@ -4636,6 +4624,18 @@
msgid "Variable(s):"
msgstr ""
+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr ""
+
#: src/ui/gui/sort-cases-dialog.c:367
msgid "Criteria"
msgstr ""
@@ -4802,7 +4802,7 @@
"Report bugs to <%s>.\n"
msgstr ""
-#: src/ui/terminal/main.c:132
+#: src/ui/terminal/main.c:133
msgid ""
"Stopping syntax file processing here to avoid a cascade of dependent command "
"failures."
Index: src/ui/gui/about.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/about.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/ui/gui/about.c 9 Feb 2007 15:06:28 -0000 1.6
+++ src/ui/gui/about.c 26 Mar 2007 10:11:01 -0000 1.7
@@ -30,18 +30,19 @@
void
about_new (GtkMenuItem *m, GtkWindow *parent)
{
- GladeXML *xml = glade_xml_new (PKGDATADIR "/psppire.glade", NULL, NULL);
+ GladeXML *xml = XML_NEW ("psppire.glade");
GtkWidget *about = get_widget_assert (xml, "aboutdialog1");
GdkPixbuf *pb =
- gdk_pixbuf_new_from_file_at_size (PKGDATADIR "/pspplogo.png", 64, 64, 0);
+ gdk_pixbuf_new_from_file_at_size (relocate (PKGDATADIR "/pspplogo.png"),
+ 64, 64, 0);
gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), pb);
gtk_window_set_icon_from_file (GTK_WINDOW (about),
- PKGDATADIR "/psppicon.png", 0);
+ relocate (PKGDATADIR "/psppicon.png"), 0);
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about),
"http://www.gnu.org/software/pspp";);
Index: src/ui/gui/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/ui/gui/automake.mk 26 Jan 2007 07:35:04 -0000 1.21
+++ src/ui/gui/automake.mk 26 Mar 2007 10:11:01 -0000 1.22
@@ -4,12 +4,20 @@
bin_PROGRAMS += src/ui/gui/psppire
+src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall \
+ -DINSTALLDIR=\"$(bindir)\"
-src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GLADE_CFLAGS) -Wall
src_ui_gui_psppire_LDFLAGS = \
- -export-dynamic \
- -rpath $(pkglibdir)
+ -export-dynamic
+
+
+if RELOCATABLE_VIA_LD
+src_ui_gui_psppire_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+else
+src_ui_gui_psppire_LDFLAGS += -rpath $(pkglibdir)
+endif
+
pkglib_LTLIBRARIES = src/ui/gui/libpsppire.la
@@ -106,3 +114,4 @@
src/ui/gui/window-manager.c \
src/ui/gui/window-manager.h
+
Index: src/ui/gui/data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/ui/gui/data-editor.c 22 Feb 2007 11:26:37 -0000 1.18
+++ src/ui/gui/data-editor.c 26 Mar 2007 10:11:01 -0000 1.19
@@ -129,8 +129,7 @@
e = (struct editor_window *) de;
- de->xml = glade_xml_new (PKGDATADIR "/data-editor.glade", NULL, NULL);
-
+ de->xml = XML_NEW ("data-editor.glade");
var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
Index: src/ui/gui/helper.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/helper.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/ui/gui/helper.h 24 Jan 2007 08:30:22 -0000 1.11
+++ src/ui/gui/helper.h 26 Mar 2007 10:11:01 -0000 1.12
@@ -21,6 +21,8 @@
#ifndef __MISC_H__
#define __MISC_H__
+#include "relocatable.h"
+
#include <data/value.h>
#include <data/format.h>
@@ -49,4 +51,9 @@
gboolean execute_syntax (struct getl_interface *sss);
+#define XML_NEW(FILE) \
+ glade_xml_new (relocate(PKGDATADIR "/" FILE), NULL, NULL)
+
+
+
#endif
Index: src/ui/gui/psppire.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- src/ui/gui/psppire.c 17 Mar 2007 12:29:40 -0000 1.36
+++ src/ui/gui/psppire.c 26 Mar 2007 10:11:01 -0000 1.37
@@ -22,8 +22,11 @@
#include <assert.h>
#include <libintl.h>
+#include "progname.h"
+#include "relocatable.h"
#include "data-editor.h"
+
#include <libpspp/version.h>
#include <libpspp/copyleft.h>
#include <data/file-handle-def.h>
@@ -100,6 +103,8 @@
GError *err = 0;
gchar *vers;
+ set_program_name (argv[0]);
+
if ( ! gtk_parse_args (&argc, &argv) )
{
perror ("Error parsing arguments");
@@ -222,6 +227,8 @@
return true;
}
+#define PIXBUF_NEW_FROM_FILE(FILE) \
+ gdk_pixbuf_new_from_file (relocate (PKGDATADIR "/" FILE), 0)
void
@@ -233,37 +240,37 @@
GdkPixbuf *pixbuf;
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0);
+ pixbuf = PIXBUF_NEW_FROM_FILE ("value-labels.png");
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set);
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/weight-cases.png", 0);
+ pixbuf = PIXBUF_NEW_FROM_FILE ("weight-cases.png");
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set);
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/goto-variable.png", 0);
+ pixbuf = PIXBUF_NEW_FROM_FILE ("goto-variable.png");
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set);
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-variable.png", 0);
+ pixbuf = PIXBUF_NEW_FROM_FILE ("insert-variable.png");
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set);
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-case.png", 0);
+ pixbuf = PIXBUF_NEW_FROM_FILE ("insert-case.png");
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set);
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/split-file.png", 0);
+ pixbuf = PIXBUF_NEW_FROM_FILE ("split-file.png");
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
gtk_icon_factory_add ( factory, "pspp-split-file", icon_set);
- pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/select-cases.png", 0);
+ pixbuf = PIXBUF_NEW_FROM_FILE ("select-cases.png");
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
g_object_unref (pixbuf);
gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set);
Index: src/ui/gui/syntax-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/syntax-editor.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- src/ui/gui/syntax-editor.c 24 Jan 2007 08:30:22 -0000 1.15
+++ src/ui/gui/syntax-editor.c 26 Mar 2007 10:11:01 -0000 1.16
@@ -308,8 +308,7 @@
struct syntax_editor *
new_syntax_editor (void)
{
- GladeXML *xml =
- glade_xml_new (PKGDATADIR "/syntax-editor.glade", NULL, NULL);
+ GladeXML *xml = XML_NEW ("syntax-editor.glade");
GtkWidget *text_view;
struct syntax_editor *se ;
Index: src/ui/gui/transpose-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/transpose-dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/ui/gui/transpose-dialog.c 26 Jan 2007 07:35:04 -0000 1.1
+++ src/ui/gui/transpose-dialog.c 26 Mar 2007 10:11:01 -0000 1.2
@@ -96,8 +96,7 @@
gint response ;
struct data_editor *de = data;
- GladeXML *xml = glade_xml_new (PKGDATADIR "/psppire.glade",
- "transpose-dialog", NULL);
+ GladeXML *xml = XML_NEW ("psppire.glade");
GtkSheet *var_sheet =
GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
Index: src/ui/gui/var-sheet.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/var-sheet.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/ui/gui/var-sheet.c 17 Mar 2007 11:59:53 -0000 1.21
+++ src/ui/gui/var-sheet.c 26 Mar 2007 10:11:01 -0000 1.22
@@ -222,7 +222,7 @@
if ( row >= psppire_var_store_get_var_cnt (var_store))
return TRUE;
- xml = glade_xml_new (PKGDATADIR "/data-editor.glade", NULL, NULL);
+ xml = XML_NEW ("data-editor.glade");
gtk_sheet_get_attributes (sheet, row, column, &attributes);
Index: src/ui/gui/weight-cases-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/weight-cases-dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/ui/gui/weight-cases-dialog.c 26 Jan 2007 07:35:04 -0000 1.2
+++ src/ui/gui/weight-cases-dialog.c 26 Mar 2007 10:11:01 -0000 1.3
@@ -75,8 +75,7 @@
PsppireDict *dict;
struct variable *var;
- GladeXML *xml = glade_xml_new (PKGDATADIR "/psppire.glade",
- "weight-cases-dialog", NULL);
+ GladeXML *xml = XML_NEW ("psppire.glade");
GtkWidget *dialog = get_widget_assert (xml, "weight-cases-dialog");
GtkWidget *source = get_widget_assert (xml, "weight-cases-treeview");
Index: src/ui/gui/window-manager.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/window-manager.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/ui/gui/window-manager.c 22 Feb 2007 11:26:37 -0000 1.9
+++ src/ui/gui/window-manager.c 26 Mar 2007 10:11:01 -0000 1.10
@@ -20,6 +20,8 @@
#include <config.h>
+#include "relocatable.h"
+
#include <glib.h>
#include "syntax-editor.h"
#include "data-editor.h"
@@ -100,7 +102,7 @@
gtk_window_set_icon_from_file (GTK_WINDOW (e->window),
- PKGDATADIR "/psppicon.png", 0);
+ relocate (PKGDATADIR "/psppicon.png"), 0);
g_signal_connect (e->window, "destroy",
G_CALLBACK (deregister_window), e);
Index: src/ui/terminal/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/automake.mk,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/ui/terminal/automake.mk 4 Jan 2007 08:15:27 -0000 1.14
+++ src/ui/terminal/automake.mk 26 Mar 2007 10:11:01 -0000 1.15
@@ -11,13 +11,14 @@
src/ui/terminal/msg-ui.c \
src/ui/terminal/msg-ui.h
+src_ui_terminal_libui_a_CFLAGS = -DINSTALLDIR=\"$(bindir)\"
bin_PROGRAMS += src/ui/terminal/pspp
src_ui_terminal_pspp_SOURCES =
-src_ui_terminal_pspp_LDADD = \
+src_ui_terminal_pspp_LDFLAGS = \
src/ui/terminal/libui.a \
src/language/liblanguage.a \
src/output/charts/libcharts.a \
@@ -33,3 +34,9 @@
gl/libgl.la \
@LIBINTL@ @LIBREADLINE@
+
+
+
+if RELOCATABLE_VIA_LD
+src_ui_terminal_pspp_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+endif
Index: src/ui/terminal/main.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/main.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- src/ui/terminal/main.c 26 Feb 2007 04:52:23 -0000 1.31
+++ src/ui/terminal/main.c 26 Mar 2007 10:11:01 -0000 1.32
@@ -92,7 +92,8 @@
signal (SIGFPE, bug_handler);
signal (SIGINT, interrupt_handler);
- set_program_name ("pspp");
+ set_program_name (argv[0]);
+
i18n_init ();
fpu_init ();
gsl_set_error_handler_off ();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp .cvsignore Smake po/de.po po/pspp.pot src/...,
John Darrington <=