diff --git a/Makefile.am b/Makefile.am index d11ae66d1..c8c30da1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ 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) +# scrollkeeper-rebuilddb -p $(DESTDIR)$(scrollkeeper_localstate_dir) # Remove generated files uninstall-local: diff --git a/Makefile.in b/Makefile.in index ffa4413fd..93db37b69 100644 --- a/Makefile.in +++ b/Makefile.in @@ -97,7 +97,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ @@ -482,7 +481,7 @@ 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) +# scrollkeeper-rebuilddb -p $(DESTDIR)$(scrollkeeper_localstate_dir) # Remove generated files uninstall-local: diff --git a/configure b/configure index 9b1671f28..2da7e9584 100755 --- a/configure +++ b/configure @@ -3811,53 +3811,9 @@ echo "${ECHO_T}ok" >&6 SCROLLKEEPER_REQUIRED=0.1.4 -# 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_SCROLLKEEPER_CONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $SCROLLKEEPER_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_SCROLLKEEPER_CONFIG="$SCROLLKEEPER_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - 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_SCROLLKEEPER_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_SCROLLKEEPER_CONFIG" && ac_cv_path_SCROLLKEEPER_CONFIG="no" - ;; -esac -fi -SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG +DISABLE_SCROLLKEEPER=1 -if test -n "$SCROLLKEEPER_CONFIG"; then - echo "$as_me:$LINENO: result: $SCROLLKEEPER_CONFIG" >&5 -echo "${ECHO_T}$SCROLLKEEPER_CONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -if test x$SCROLLKEEPER_CONFIG = xno; then - { { echo "$as_me:$LINENO: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package." >&5 -echo "$as_me: error: Couldn't find scrollkeeper-config. Please install the scrollkeeper package." >&2;} - { (exit 1); exit 1; }; } - DISABLE_SCROLLKEEPER=1 - -fi # Extract the first word of "jw", so it can be a program name with args. set dummy jw; ac_word=$2 @@ -4590,7 +4546,6 @@ 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,@SCROLLKEEPER_CONFIG@,$SCROLLKEEPER_CONFIG,;t t s,@DISABLE_SCROLLKEEPER@,$DISABLE_SCROLLKEEPER,;t t s,@JW@,$JW,;t t s,@HAVE_JW@,$HAVE_JW,;t t diff --git a/configure.in b/configure.in index 1cced9e4d..4418c3270 100644 --- a/configure.in +++ b/configure.in @@ -231,12 +231,15 @@ SCROLLKEEPER_REQUIRED=0.1.4 AC_SUBST(SCROLLKEEPER_REQUIRED) dnl First see that *some* version of scrollkeeper is installed -AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config, no) -if test x$SCROLLKEEPER_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package.) - DISABLE_SCROLLKEEPER=1 - AC_SUBST(DISABLE_SCROLLKEEPER) -fi +dnl AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config, no) +dnl if test x$SCROLLKEEPER_CONFIG = xno; then +dnl AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package.) +dnl DISABLE_SCROLLKEEPER=1 +dnl AC_SUBST(DISABLE_SCROLLKEEPER) +dnl fi + +DISABLE_SCROLLKEEPER=1 +AC_SUBST(DISABLE_SCROLLKEEPER) dnl ====================================================== dnl == GNOME modified DTD's need jw, not db2html diff --git a/doc/Makefile.in b/doc/Makefile.in index 4a037eb8d..597e2322e 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -97,7 +97,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/doc/extending-gramps/C/Makefile.in b/doc/extending-gramps/C/Makefile.in index d2a978f47..71c1d2ba3 100644 --- a/doc/extending-gramps/C/Makefile.in +++ b/doc/extending-gramps/C/Makefile.in @@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/doc/extending-gramps/Makefile.in b/doc/extending-gramps/Makefile.in index db6eb050e..3c323a071 100644 --- a/doc/extending-gramps/Makefile.in +++ b/doc/extending-gramps/Makefile.in @@ -97,7 +97,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/doc/gramps-manual/C/Makefile.in b/doc/gramps-manual/C/Makefile.in index e9854f8b2..537aa4b95 100644 --- a/doc/gramps-manual/C/Makefile.in +++ b/doc/gramps-manual/C/Makefile.in @@ -129,7 +129,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/doc/gramps-manual/Makefile.in b/doc/gramps-manual/Makefile.in index 9d682321c..405b7a4f8 100644 --- a/doc/gramps-manual/Makefile.in +++ b/doc/gramps-manual/Makefile.in @@ -97,7 +97,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/doc/gramps.1 b/doc/gramps.1 index 9b5b1bb1f..27210524a 100644 --- a/doc/gramps.1 +++ b/doc/gramps.1 @@ -1,4 +1,4 @@ -.TH gramps 1 "0.9.0pre2" "man page by Brandon L. Griffith" "" +.TH gramps 1 "0.9.0" "man page by Brandon L. Griffith" "" .SH "NAME" .LP gramps \- Genealogical Research and Analysis Management Programming System diff --git a/gramps.spec b/gramps.spec index bef8058a0..c46bbb1e3 100644 --- a/gramps.spec +++ b/gramps.spec @@ -64,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gramps/*.xpm %{_datadir}/gramps/*.jpg +%{_datadir}/gramps/gramps.desktop %{_datadir}/gramps/*.png %{_datadir}/gramps/*.py %{_datadir}/gramps/*.pyo @@ -84,12 +85,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/omf/gramps -%post -if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi - -%postun -if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi - %changelog * Fri Jun 14 2002 Donald Peterson - add scrollkeeper dependencies and some file cleanup diff --git a/gramps.spec.in b/gramps.spec.in index 38b9c751c..5f6262be8 100644 --- a/gramps.spec.in +++ b/gramps.spec.in @@ -64,6 +64,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gramps/*.xpm %{_datadir}/gramps/*.jpg +%{_datadir}/gramps/gramps.desktop %{_datadir}/gramps/*.png %{_datadir}/gramps/*.py %{_datadir}/gramps/*.pyo @@ -84,12 +85,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/omf/gramps -%post -if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi - -%postun -if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi - %changelog * Fri Jun 14 2002 Donald Peterson - add scrollkeeper dependencies and some file cleanup diff --git a/omf-install/Makefile.am b/omf-install/Makefile.am index 5fe432271..41c585427 100644 --- a/omf-install/Makefile.am +++ b/omf-install/Makefile.am @@ -5,11 +5,11 @@ install-data-local: -for file in $(srcdir)/*.omf; do \ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \ done - -scrollkeeper-update -p $(localstatedir)/scrollkeeper +# -scrollkeeper-update -p $(localstatedir)/scrollkeeper uninstall-local: -for file in $(srcdir)/*.omf; do \ basefile=`basename $$file`; \ rm -f $(omf_dest_dir)/$$basefile; \ done - -scrollkeeper-update -p $(localstatedir)/scrollkeeper +# -scrollkeeper-update -p $(localstatedir)/scrollkeeper diff --git a/omf-install/Makefile.in b/omf-install/Makefile.in index 449abfc44..62745257a 100644 --- a/omf-install/Makefile.in +++ b/omf-install/Makefile.in @@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ @@ -234,14 +233,14 @@ install-data-local: -for file in $(srcdir)/*.omf; do \ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \ done - -scrollkeeper-update -p $(localstatedir)/scrollkeeper +# -scrollkeeper-update -p $(localstatedir)/scrollkeeper uninstall-local: -for file in $(srcdir)/*.omf; do \ basefile=`basename $$file`; \ rm -f $(omf_dest_dir)/$$basefile; \ done - -scrollkeeper-update -p $(localstatedir)/scrollkeeper +# -scrollkeeper-update -p $(localstatedir)/scrollkeeper # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/Makefile.am b/src/Makefile.am index a9dd2dc49..37fa9552d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,7 @@ GLADEFILES := ${wildcard *.glade} GRAPHICS := ${wildcard *.xpm} ${wildcard *.png} ${wildcard *.jpg} # Other stuff that we need to install -pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop +pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop grampslib.so EXTRA_DIST = grampslib.i diff --git a/src/Makefile.in b/src/Makefile.in index 9540d46fa..2fe0a32a0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ @@ -133,7 +132,7 @@ GLADEFILES := ${wildcard *.glade} GRAPHICS := ${wildcard *.xpm} ${wildcard *.png} ${wildcard *.jpg} # Other stuff that we need to install -pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop +pkgdata_DATA = ${INTLLIBS} ${GLADEFILES} ${GRAPHICS} gramps.desktop grampslib.so EXTRA_DIST = grampslib.i diff --git a/src/data/Makefile.in b/src/data/Makefile.in index 71ac7e014..ea0ac70fc 100644 --- a/src/data/Makefile.in +++ b/src/data/Makefile.in @@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/src/data/templates/Makefile.in b/src/data/templates/Makefile.in index 786b30eff..0b89716b8 100644 --- a/src/data/templates/Makefile.in +++ b/src/data/templates/Makefile.in @@ -96,7 +96,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/src/docgen/Makefile.in b/src/docgen/Makefile.in index 410a8b2cf..aa5835c49 100644 --- a/src/docgen/Makefile.in +++ b/src/docgen/Makefile.in @@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/src/filters/Makefile.in b/src/filters/Makefile.in index 1607b1293..92fd7ad81 100644 --- a/src/filters/Makefile.in +++ b/src/filters/Makefile.in @@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in index e7bb641dd..7b0dce6e6 100644 --- a/src/plugins/Makefile.in +++ b/src/plugins/Makefile.in @@ -96,7 +96,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@ diff --git a/src/po/Makefile.in b/src/po/Makefile.in index e73ef2489..f28c546b9 100644 --- a/src/po/Makefile.in +++ b/src/po/Makefile.in @@ -95,7 +95,6 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ PYTHON_PREFIX = @PYTHON_PREFIX@ PYTHON_VERSION = @PYTHON_VERSION@ RELEASE = @RELEASE@ -SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@ SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@ STRIP = @STRIP@ SWIG = @SWIG@