diff --git a/Makefile.am b/Makefile.am index ed452ebad..71f575bd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ # copyright (C) 2000 Sun Microsystems, Inc. -SUBDIRS = src doc +SUBDIRS = src doc omf-install example EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS diff --git a/Makefile.in b/Makefile.in index 93db37b69..4ff7e05e6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -70,16 +70,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ -HAVE_JW = @HAVE_JW@ +GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -97,7 +95,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ @@ -111,14 +110,13 @@ pkgpythondir = @pkgpythondir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ -SUBDIRS = src doc omf-install +SUBDIRS = src doc omf-install example -EXTRA_DIST = autogen.sh gramps.spec.in +EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS bin_SCRIPTS = gramps grampsdocdir = $(datadir)/doc/gramps-$(VERSION) -scrollkeeper_localstate_dir = $(localstatedir)/lib/scrollkeeper subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -478,10 +476,7 @@ dist-hook: gramps.spec # Build/rebuild the catalog install-data-hook: - rm -rf $(DESTDIR)$(scrollkeeper_localstate_dir) - $(mkinstalldirs) $(DESTDIR)$(scrollkeeper_localstate_dir) $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log -# scrollkeeper-rebuilddb -p $(DESTDIR)$(scrollkeeper_localstate_dir) # Remove generated files uninstall-local: diff --git a/configure b/configure index 47058dcc8..d3271b624 100755 --- a/configure +++ b/configure @@ -3807,23 +3807,16 @@ fi echo "$as_me:$LINENO: result: ok" >&5 echo "${ECHO_T}ok" >&6 -SCROLLKEEPER_REQUIRED=0.1.4 - - - -DISABLE_SCROLLKEEPER=1 - - -# Extract the first word of "jw", so it can be a program name with args. -set dummy jw; ac_word=$2 +# Extract the first word of "scrollkeeper-config", so it can be a program name with args. +set dummy scrollkeeper-config; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_JW+set}" = set; then +if test "${ac_cv_path_SK_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $JW in + case $SK_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_JW="$JW" # Let the user override the test with a path. + ac_cv_path_SK_CONFIG="$SK_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -3833,33 +3826,42 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_JW="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_SK_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done - test -z "$ac_cv_path_JW" && ac_cv_path_JW="no" + test -z "$ac_cv_path_SK_CONFIG" && ac_cv_path_SK_CONFIG="no" ;; esac fi -JW=$ac_cv_path_JW +SK_CONFIG=$ac_cv_path_SK_CONFIG -if test -n "$JW"; then - echo "$as_me:$LINENO: result: $JW" >&5 -echo "${ECHO_T}$JW" >&6 +if test -n "$SK_CONFIG"; then + echo "$as_me:$LINENO: result: $SK_CONFIG" >&5 +echo "${ECHO_T}$SK_CONFIG" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -if test x$JW = xno; then - HAVE_JW="no" -else - HAVE_JW="yes" +if test x$SK_CONFIG = xno; then + { { echo "$as_me:$LINENO: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net" >&5 +echo "$as_me: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net" >&2;} + { (exit 1); exit 1; }; } fi +localstatedir=/var/lib + +if test ${prefix} = "NONE" ; then + GPREFIX="/usr/local" +else + GPREFIX="${prefix}" +fi + +SCROLLKEEPER_BUILD_REQUIRED=0.3.5 @@ -3878,7 +3880,8 @@ fi -ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile doc/extending-gramps/Makefile doc/extending-gramps/C/Makefile omf-install/Makefile gramps.spec gramps.sh" + +ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile doc/extending-gramps/Makefile doc/extending-gramps/C/Makefile example/Makefile example/gramps/Makefile omf-install/Makefile gramps.spec gramps.sh" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -4408,6 +4411,8 @@ do "doc/gramps-manual/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/gramps-manual/C/Makefile" ;; "doc/extending-gramps/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/extending-gramps/Makefile" ;; "doc/extending-gramps/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/extending-gramps/C/Makefile" ;; + "example/Makefile" ) CONFIG_FILES="$CONFIG_FILES example/Makefile" ;; + "example/gramps/Makefile" ) CONFIG_FILES="$CONFIG_FILES example/gramps/Makefile" ;; "omf-install/Makefile" ) CONFIG_FILES="$CONFIG_FILES omf-install/Makefile" ;; "gramps.spec" ) CONFIG_FILES="$CONFIG_FILES gramps.spec" ;; "gramps.sh" ) CONFIG_FILES="$CONFIG_FILES gramps.sh" ;; @@ -4545,11 +4550,10 @@ s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CPP@,$CPP,;t t s,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t -s,@SCROLLKEEPER_REQUIRED@,$SCROLLKEEPER_REQUIRED,;t t -s,@DISABLE_SCROLLKEEPER@,$DISABLE_SCROLLKEEPER,;t t -s,@JW@,$JW,;t t -s,@HAVE_JW@,$HAVE_JW,;t t +s,@SK_CONFIG@,$SK_CONFIG,;t t +s,@SCROLLKEEPER_BUILD_REQUIRED@,$SCROLLKEEPER_BUILD_REQUIRED,;t t s,@GNOMEHELP@,$GNOMEHELP,;t t +s,@GPREFIX@,$GPREFIX,;t t s,@P15_INCLUDES@,$P15_INCLUDES,;t t s,@P20_INCLUDES@,$P20_INCLUDES,;t t s,@P21_INCLUDES@,$P21_INCLUDES,;t t diff --git a/configure.in b/configure.in index d2cde0e42..f63496654 100644 --- a/configure.in +++ b/configure.in @@ -235,6 +235,15 @@ dnl by anything besides scrollkeeper in our setup dnl ================================== localstatedir=/var/lib +if test ${prefix} = "NONE" ; then + GPREFIX="/usr/local" +else + GPREFIX="${prefix}" +fi + +dnl ====================================================== +dnl == end of modern doc tests +dnl ====================================================== SCROLLKEEPER_BUILD_REQUIRED=0.3.5 AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED) @@ -244,6 +253,7 @@ AC_SUBST(PYTHON) AC_SUBST(PYTHON_VERSION) AC_SUBST(GNOMEHELP) AC_SUBST(LIBS) +AC_SUBST(GPREFIX) AC_SUBST(P15_INCLUDES) AC_SUBST(P20_INCLUDES) @@ -268,5 +278,10 @@ src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile +doc/extending-gramps/Makefile +doc/extending-gramps/C/Makefile +example/Makefile +example/gramps/Makefile +omf-install/Makefile gramps.spec gramps.sh]) diff --git a/doc/Makefile.in b/doc/Makefile.in index 5ae37e334..973675f61 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -74,6 +74,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ diff --git a/doc/extending-gramps/C/Makefile.in b/doc/extending-gramps/C/Makefile.in index 71c1d2ba3..a10b5bf07 100644 --- a/doc/extending-gramps/C/Makefile.in +++ b/doc/extending-gramps/C/Makefile.in @@ -68,16 +68,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ -HAVE_JW = @HAVE_JW@ +GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -95,7 +93,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/doc/extending-gramps/Makefile.in b/doc/extending-gramps/Makefile.in index 3c323a071..a0ac3e05d 100644 --- a/doc/extending-gramps/Makefile.in +++ b/doc/extending-gramps/Makefile.in @@ -70,16 +70,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ -HAVE_JW = @HAVE_JW@ +GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -97,7 +95,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/doc/gramps-manual/C/Makefile.in b/doc/gramps-manual/C/Makefile.in index fd2d56cf8..46d0fa62e 100644 --- a/doc/gramps-manual/C/Makefile.in +++ b/doc/gramps-manual/C/Makefile.in @@ -134,6 +134,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ diff --git a/doc/gramps-manual/Makefile.in b/doc/gramps-manual/Makefile.in index d3f5a34ac..5b78ecbd9 100644 --- a/doc/gramps-manual/Makefile.in +++ b/doc/gramps-manual/Makefile.in @@ -74,6 +74,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ diff --git a/example/Makefile.am b/example/Makefile.am new file mode 100644 index 000000000..7c50c9b86 --- /dev/null +++ b/example/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = gramps diff --git a/example/gedcom/sample.ged b/example/gedcom/sample.ged index 593d6365b..22a9e27ff 100755 --- a/example/gedcom/sample.ged +++ b/example/gedcom/sample.ged @@ -70,6 +70,10 @@ 1 _DEG 2 DATE 1984 2 PLAC B.S.E.E. +1 OBJE +2 FORM jpg +2 FILE C:\Images\MyImages\test.jpg +2 TITL Random title 1 FAMS @F01@ 1 FAMC @F02@ 0 @I02@ INDI diff --git a/example/gramps.zodb b/example/gramps.zodb deleted file mode 100644 index f80efabbc..000000000 Binary files a/example/gramps.zodb and /dev/null differ diff --git a/example/gramps/10.png b/example/gramps/10.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/10.png and /dev/null differ diff --git a/example/gramps/11.png b/example/gramps/11.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/11.png and /dev/null differ diff --git a/example/gramps/12.png b/example/gramps/12.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/12.png and /dev/null differ diff --git a/example/gramps/13.png b/example/gramps/13.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/13.png and /dev/null differ diff --git a/example/gramps/14.png b/example/gramps/14.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/14.png and /dev/null differ diff --git a/example/gramps/15.png b/example/gramps/15.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/15.png and /dev/null differ diff --git a/example/gramps/6.png b/example/gramps/6.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/6.png and /dev/null differ diff --git a/example/gramps/7.png b/example/gramps/7.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/7.png and /dev/null differ diff --git a/example/gramps/8.png b/example/gramps/8.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/8.png and /dev/null differ diff --git a/example/gramps/9.png b/example/gramps/9.png deleted file mode 100644 index 3e8ad0fab..000000000 Binary files a/example/gramps/9.png and /dev/null differ diff --git a/example/gramps/Makefile.am b/example/gramps/Makefile.am new file mode 100644 index 000000000..dff863e45 --- /dev/null +++ b/example/gramps/Makefile.am @@ -0,0 +1,12 @@ +# This is the src/data/templates level Makefile +pkgdata_DATA = \ + data.gramps\ + O0.jpg\ + O1.jpg\ + O2.jpg\ + O3.jpg\ + O4.jpg\ + O5.jpg + +pkgdatadir = ${datadir}/@PACKAGE@/example +EXTRA_DIST = ${pkgdata_DATA} diff --git a/example/gramps/O0006.jpg b/example/gramps/O0006.jpg deleted file mode 100644 index 783e4b262..000000000 Binary files a/example/gramps/O0006.jpg and /dev/null differ diff --git a/omf-install/Makefile.in b/omf-install/Makefile.in index 62745257a..6e6d9b003 100644 --- a/omf-install/Makefile.in +++ b/omf-install/Makefile.in @@ -68,16 +68,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ -HAVE_JW = @HAVE_JW@ +GPREFIX = @GPREFIX@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -95,7 +93,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/src/Makefile.in b/src/Makefile.in index 317ec03d3..48822b80d 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -68,17 +68,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ GPREFIX = @GPREFIX@ -HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = intl22.so -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -96,7 +93,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/src/calendars/Makefile.in b/src/calendars/Makefile.in index 54ffc5af9..d4fa5a673 100644 --- a/src/calendars/Makefile.in +++ b/src/calendars/Makefile.in @@ -73,17 +73,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ GPREFIX = @GPREFIX@ -HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -101,7 +98,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/src/const.py b/src/const.py index 59d5a6c88..4901adecb 100644 --- a/src/const.py +++ b/src/const.py @@ -46,7 +46,6 @@ nautdir = "/usr/share/pixmaps/nautilus" prefixdir = "/usr/local" - #------------------------------------------------------------------------- # # Paths to files - assumes that files reside in the same directory as diff --git a/src/data/Makefile.in b/src/data/Makefile.in index be82afc61..e48b41930 100644 --- a/src/data/Makefile.in +++ b/src/data/Makefile.in @@ -68,17 +68,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ GPREFIX = @GPREFIX@ -HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -96,7 +93,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/src/data/templates/Makefile.in b/src/data/templates/Makefile.in index f447fdfb5..f7a67dbf8 100644 --- a/src/data/templates/Makefile.in +++ b/src/data/templates/Makefile.in @@ -69,17 +69,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ GPREFIX = @GPREFIX@ -HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -97,7 +94,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/src/docgen/Makefile.in b/src/docgen/Makefile.in index 29f73f4ac..16fc27385 100644 --- a/src/docgen/Makefile.in +++ b/src/docgen/Makefile.in @@ -72,17 +72,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ GPREFIX = @GPREFIX@ -HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -100,7 +97,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/src/filters/Makefile.in b/src/filters/Makefile.in index 753b0b9f2..680d66f47 100644 --- a/src/filters/Makefile.in +++ b/src/filters/Makefile.in @@ -68,17 +68,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ GPREFIX = @GPREFIX@ -HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -96,7 +93,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index 5e0ad42ac..644a06e58 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -73,17 +73,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ GPREFIX = @GPREFIX@ -HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -101,7 +98,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@ diff --git a/src/po/Makefile.in b/src/po/Makefile.in index c6234ef97..9dbf47e80 100644 --- a/src/po/Makefile.in +++ b/src/po/Makefile.in @@ -68,17 +68,14 @@ AWK = @AWK@ BINSH = @BINSH@ CC = @CC@ DEPDIR = @DEPDIR@ -DISABLE_SCROLLKEEPER = @DISABLE_SCROLLKEEPER@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ GPREFIX = @GPREFIX@ -HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INTLLIBS = @INTLLIBS@ -JW = @JW@ LANGUAGES = @LANGUAGES@ LIBS = @LIBS@ MOFILES = @MOFILES@ @@ -96,7 +93,8 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ +SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ +SK_CONFIG = @SK_CONFIG@ STRIP = @STRIP@ SWIG = @SWIG@ VERSION = @VERSION@