From b38beb9019020eaec7a202ac19da86571489ad5c Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Thu, 17 Apr 2003 23:45:42 +0000 Subject: [PATCH] Removing omf-install svn: r1460 --- gramps2/Makefile.am | 2 +- gramps2/Makefile.in | 2 +- gramps2/configure | 37 +--- gramps2/configure.in | 1 - gramps2/omf-install/Makefile.am | 15 -- gramps2/omf-install/Makefile.in | 245 --------------------- gramps2/omf-install/extending-gramps-C.omf | 14 -- gramps2/omf-install/gramps-manual-C.omf | 14 -- 8 files changed, 11 insertions(+), 319 deletions(-) delete mode 100644 gramps2/omf-install/Makefile.am delete mode 100644 gramps2/omf-install/Makefile.in delete mode 100644 gramps2/omf-install/extending-gramps-C.omf delete mode 100644 gramps2/omf-install/gramps-manual-C.omf diff --git a/gramps2/Makefile.am b/gramps2/Makefile.am index 442055c33..03d2f022d 100644 --- a/gramps2/Makefile.am +++ b/gramps2/Makefile.am @@ -1,6 +1,6 @@ # copyright (C) 2000 Sun Microsystems, Inc. -SUBDIRS = src doc omf-install example +SUBDIRS = src doc example EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS diff --git a/gramps2/Makefile.in b/gramps2/Makefile.in index 94457b14e..eefe93302 100644 --- a/gramps2/Makefile.in +++ b/gramps2/Makefile.in @@ -110,7 +110,7 @@ pkgpythondir = @pkgpythondir@ pyexecdir = @pyexecdir@ pythondir = @pythondir@ -SUBDIRS = src doc omf-install example +SUBDIRS = src doc example EXTRA_DIST = autogen.sh gramps.spec.in COPYING-DOCS diff --git a/gramps2/configure b/gramps2/configure index a7cfcc9ff..a48397eb4 100755 --- a/gramps2/configure +++ b/gramps2/configure @@ -1811,12 +1811,13 @@ else echo "${ECHO_T}no" >&6 fi + am_display_PYTHON=$am_cv_pathless_PYTHON fi - echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON version" >&5 -echo $ECHO_N "checking for $am_cv_pathless_PYTHON version... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 +echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6 if test "${am_cv_python_version+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1834,8 +1835,8 @@ echo "${ECHO_T}$am_cv_python_version" >&6 - echo "$as_me:$LINENO: checking for $am_cv_pathless_PYTHON platform" >&5 -echo $ECHO_N "checking for $am_cv_pathless_PYTHON platform... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 +echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6 if test "${am_cv_python_platform+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -1849,34 +1850,15 @@ echo "${ECHO_T}$am_cv_python_platform" >&6 - echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6 -if test "${am_cv_python_pythondir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` -fi -echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 -echo "${ECHO_T}$am_cv_python_pythondir" >&6 - pythondir=$am_cv_python_pythondir + pythondir=$PYTHON_PREFIX"/lib/python"$PYTHON_VERSION/site-packages pkgpythondir=\${pythondir}/$PACKAGE - echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 -echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6 -if test "${am_cv_python_pyexecdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || - echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` -fi -echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 -echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 - pyexecdir=$am_cv_python_pyexecdir + + pyexecdir=${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages @@ -4188,7 +4170,7 @@ SCROLLKEEPER_BUILD_REQUIRED=0.3.5 - 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 example/Makefile example/gramps/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 example/Makefile example/gramps/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 @@ -4771,7 +4753,6 @@ do "doc/gramps-manual/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/gramps-manual/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" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; diff --git a/gramps2/configure.in b/gramps2/configure.in index e819b579a..9a080d4a7 100644 --- a/gramps2/configure.in +++ b/gramps2/configure.in @@ -282,6 +282,5 @@ doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile example/Makefile example/gramps/Makefile -omf-install/Makefile gramps.spec gramps.sh]) diff --git a/gramps2/omf-install/Makefile.am b/gramps2/omf-install/Makefile.am deleted file mode 100644 index 41c585427..000000000 --- a/gramps2/omf-install/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -omf_dest_dir=$(datadir)/omf/gramps - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) - -for file in $(srcdir)/*.omf; do \ - $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \ - done -# -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 diff --git a/gramps2/omf-install/Makefile.in b/gramps2/omf-install/Makefile.in deleted file mode 100644 index 6e6d9b003..000000000 --- a/gramps2/omf-install/Makefile.in +++ /dev/null @@ -1,245 +0,0 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. -# @configure_input@ - -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -AMTAR = @AMTAR@ -AWK = @AWK@ -BINSH = @BINSH@ -CC = @CC@ -DEPDIR = @DEPDIR@ -GNOMEHELP = @GNOMEHELP@ -GNOMEINC = @GNOMEINC@ -GNOMELIB = @GNOMELIB@ -GPREF = @GPREF@ -GPREFIX = @GPREFIX@ -HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -LANGUAGES = @LANGUAGES@ -LIBS = @LIBS@ -MOFILES = @MOFILES@ -MSGFMT = @MSGFMT@ -P15_INCLUDES = @P15_INCLUDES@ -P20_INCLUDES = @P20_INCLUDES@ -P21_INCLUDES = @P21_INCLUDES@ -P22_INCLUDES = @P22_INCLUDES@ -PACKAGE = @PACKAGE@ -POFILES = @POFILES@ -PYTHON = @PYTHON@ -PYTHON22 = @PYTHON22@ -PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ -PYTHON_PLATFORM = @PYTHON_PLATFORM@ -PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_VERSION = @PYTHON_VERSION@ -RELEASE = @RELEASE@ -SCROLLKEEPER_BUILD_REQUIRED = @SCROLLKEEPER_BUILD_REQUIRED@ -SK_CONFIG = @SK_CONFIG@ -STRIP = @STRIP@ -SWIG = @SWIG@ -VERSION = @VERSION@ -VERSIONSTRING = @VERSIONSTRING@ -ZIP = @ZIP@ -am__include = @am__include@ -am__quote = @am__quote@ -install_sh = @install_sh@ -pkgpyexecdir = @pkgpyexecdir@ -pkgpythondir = @pkgpythondir@ -pyexecdir = @pyexecdir@ -pythondir = @pythondir@ -omf_dest_dir = $(datadir)/omf/gramps -subdir = omf-install -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = Makefile.am Makefile.in -all: all-am - -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu omf-install/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -uninstall-info-am: -tags: TAGS -TAGS: - -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) - -distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile - -installdirs: - -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic mostlyclean-am - -distclean: distclean-am - -distclean-am: clean-am distclean-generic - -dvi: dvi-am - -dvi-am: - -info: info-am - -info-am: - -install-data-am: install-data-local - -install-exec-am: - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-generic - -uninstall-am: uninstall-info-am uninstall-local - -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic uninstall uninstall-am \ - uninstall-info-am uninstall-local - - -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) - -for file in $(srcdir)/*.omf; do \ - $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \ - done -# -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 -# 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/gramps2/omf-install/extending-gramps-C.omf b/gramps2/omf-install/extending-gramps-C.omf deleted file mode 100644 index 0928310cf..000000000 --- a/gramps2/omf-install/extending-gramps-C.omf +++ /dev/null @@ -1,14 +0,0 @@ - - - - - Writing GRAMPS Extensions - - - GNOME|Applications - - - - - - diff --git a/gramps2/omf-install/gramps-manual-C.omf b/gramps2/omf-install/gramps-manual-C.omf deleted file mode 100644 index e7df67b31..000000000 --- a/gramps2/omf-install/gramps-manual-C.omf +++ /dev/null @@ -1,14 +0,0 @@ - - - - - GRAMPS User Manual - - - GNOME|Applications - - - - - -