[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue/geas INSTALL Makefile.am configure.in src/...
From: |
Reinhard Mueller |
Subject: |
gnue/geas INSTALL Makefile.am configure.in src/... |
Date: |
Mon, 11 Jun 2001 15:23:32 -0700 |
CVSROOT: /cvs
Module name: gnue
Changes by: Reinhard Mueller <address@hidden> 01/06/11 15:23:32
Modified files:
geas : INSTALL Makefile.am configure.in
geas/src : .cvsignore Makefile.am
Added files:
geas : geas.conf.in geas.doxygen.cfg.in
geas/src : geas.conf
Removed files:
geas : geas.doxygen.cfg
geas/src : geas.conf-dist
Log message:
Prepared for release 0.0.5
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/geas.conf.in?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/geas.doxygen.cfg.in?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/INSTALL.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/Makefile.am.diff?cvsroot=OldCVS&tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/configure.in.diff?cvsroot=OldCVS&tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas.conf?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/.cvsignore.diff?cvsroot=OldCVS&tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/Makefile.am.diff?cvsroot=OldCVS&tr1=1.36&tr2=1.37&r1=text&r2=text
Patches:
Index: gnue/geas/INSTALL
diff -u gnue/geas/INSTALL:1.5 gnue/geas/INSTALL:1.6
--- gnue/geas/INSTALL:1.5 Sun Jun 10 15:32:45 2001
+++ gnue/geas/INSTALL Mon Jun 11 15:23:32 2001
@@ -65,13 +65,7 @@
At least one of these must be selected:
--with-mysql : Select MySQL support.
--with-postgresql : Select PostgreSQL support.
---with-libgda : libgda support will be added in the future.
-Ignored, for now, for simplicity of configuration:
---sysconfdir=DIR : Specify the directory to store 'geas.conf' in.
---localstatedir=DIR : Specify location of IOR file (and a process ID file)
-
-
Type "make" to compile GEAS.
@@ -81,6 +75,10 @@
Edit geas.conf to reflect the database you are using. This should be
reasonably self-explanatory, and all options are commented in the default
file.
+
+The geas.conf from the main directory gets installed. Another copy of geas.conf
+can be found in the src directory. This is used when geas-server is run from
+the source directory for testing purposes.
Basic Installation
Index: gnue/geas/Makefile.am
diff -u gnue/geas/Makefile.am:1.10 gnue/geas/Makefile.am:1.11
--- gnue/geas/Makefile.am:1.10 Sat Jun 9 16:35:38 2001
+++ gnue/geas/Makefile.am Mon Jun 11 15:23:32 2001
@@ -1,10 +1,15 @@
-## $Id: Makefile.am,v 1.10 2001/06/09 23:35:38 reinhard Exp $
+## $Id: Makefile.am,v 1.11 2001/06/11 22:23:32 reinhard Exp $
SUBDIRS = lib src tools examples idl
-rpms: dist
- rpm -ta $(top_builddir)/$(PACKAGE)-$(VERSION).tar.gz
+sysconf_DATA = geas.conf
+
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
dist-hook: geas.spec
cp geas.spec $(distdir)
cp -R doc $(distdir)/doc
+
+rpms: dist
+ rpm -ta $(top_builddir)/$(PACKAGE)-$(VERSION).tar.gz
Index: gnue/geas/configure.in
diff -u gnue/geas/configure.in:1.33 gnue/geas/configure.in:1.34
--- gnue/geas/configure.in:1.33 Sat Jun 9 16:35:38 2001
+++ gnue/geas/configure.in Mon Jun 11 15:23:32 2001
@@ -3,7 +3,7 @@
AM_CONFIG_HEADER(config.h)
AC_PREREQ(2.13)
-AM_INIT_AUTOMAKE(geas, 0.0.4)
+AM_INIT_AUTOMAKE(geas, 0.0.5)
AM_MAINTAINER_MODE
dnl Checks for programs.
@@ -367,6 +367,8 @@
AC_OUTPUT(
Makefile \
geas.spec \
+ geas.conf \
+ geas.doxygen.cfg \
examples/Makefile \
examples/businessobjects/Makefile \
examples/businessobjects/methods/Makefile \
Index: gnue/geas/src/.cvsignore
diff -u gnue/geas/src/.cvsignore:1.7 gnue/geas/src/.cvsignore:1.8
--- gnue/geas/src/.cvsignore:1.7 Mon Mar 5 19:09:16 2001
+++ gnue/geas/src/.cvsignore Mon Jun 11 15:23:32 2001
@@ -1,49 +1,17 @@
-shadowpw
-temp
-temp?
-*.log
-*.dat
-*.txt
-geas-server
-geas.h
-geas-skelimpl.h
.cvsignore
-*.pid
-*.ior
+*~
+Makefile.in
+Makefile
.deps
.libs
_libs
-*.a
*.o
-*.conf
-Makefile.in
-*~
+geas-server
+*.log
+geas.h
geas-skels.*
geas-common.*
geas-stubs.*
-Makefile
-Makefile.in
-aclocal.m4
-config.cache
-config.guess
-config.h
-config.h.in
-config.h.win32
-config.log
-config.status
-config.sub
-configure
-configure.scan
-libtool
-ltconfig
-ltmain.sh
-stamp-h
-stamp-h.in
-stamp.h
-version.h
-config.h.in
-.exrc
-install-sh
-missing
-mkinstalldirs
-
+geas-skelimpl.h
+*.pid
+*.ior
Index: gnue/geas/src/Makefile.am
diff -u gnue/geas/src/Makefile.am:1.36 gnue/geas/src/Makefile.am:1.37
--- gnue/geas/src/Makefile.am:1.36 Sat Jun 9 16:35:38 2001
+++ gnue/geas/src/Makefile.am Mon Jun 11 15:23:32 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.36 2001/06/09 23:35:38 reinhard Exp $
+## $Id: Makefile.am,v 1.37 2001/06/11 22:23:32 reinhard Exp $
SUBDIRS = config objectstore oql objectcache methods datamonitor
@@ -39,7 +39,7 @@
-luuid \
../lib/classdefs/libclassdefs.a
-geas_srvr_headers = geas.h \
+geas_srvr_headers = \
geas-server.h \
factory.h \
connection.h \
@@ -58,7 +58,7 @@
event_log_code.h \
globals.h
-IDLOUT = geas-skels.c geas-common.c geas-stubs.c
+IDLOUT = geas.h geas-skels.c geas-common.c geas-stubs.c
BUILT_SOURCES = $(IDLOUT) geas-skelimpl.h
@@ -81,10 +81,16 @@
## ----------------------------------------------------------------------------
-EXTRA_DIST = geas.conf-dist shadowpw-dist
+LST_FILES = postgresql.reserved.lst mysql.reserved.lst
+pkgdata_DATA = $(LST_FILES)
+
## ----------------------------------------------------------------------------
+EXTRA_DIST = geas.conf shadowpw-dist $(LST_FILES)
+
+## ----------------------------------------------------------------------------
+
CLEANFILES = *.ior *.pid
## ----------------------------------------------------------------------------
@@ -116,17 +122,3 @@
mv temp.x geas-skelimpl.h
# remove the unneeded file
rm geas-skelimpl.c
-
-## ----------------------------------------------------------------------------
-
-install-exec-hook:
- -if test ! -e $(sysconfdir)/geas.conf; then cd $(sysconfdir); cp
geas.conf-dist geas.conf; fi
-
-sysconf_DATA = geas.conf
-
-geas.conf: geas.conf-dist
- sed "s,address@hidden@,${pkgdatadir},g" ${srcdir}/geas.conf-dist >
geas.conf-dist.tmp
- sed "s,address@hidden@,${localstatedir},g" geas.conf-dist.tmp >
geas.conf-dist.tmp2
- sed "s,address@hidden@,${datadir},g" geas.conf-dist.tmp2 >
geas.conf-dist.tmp3
- mv geas.conf-dist.tmp3 geas.conf
- rm geas.conf-dist.tmp geas.conf-dist.tmp2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue/geas INSTALL Makefile.am configure.in src/...,
Reinhard Mueller <=