gnue/geas/src .cvsignore Makefile.am geas.conf....

[Reinhard Mueller]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     Reinhard Mueller <address@hidden>       01/06/12 15:22:22

Modified files:
        geas/src       : .cvsignore Makefile.am 
Added files:
        geas/src       : geas.conf.sample 
Removed files:
        geas/src       : geas.conf 

Log message:
        Don't distribute geas.conf; distribute geas.conf.sample instead. This is
        that people can edit their geas.conf file

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/geas.conf.sample?cvsroot=OldCVS&rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/.cvsignore.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/geas/src/Makefile.am.diff?cvsroot=OldCVS&tr1=1.38&tr2=1.39&r1=text&r2=text

Patches:
Index: gnue/geas/src/.cvsignore
diff -u gnue/geas/src/.cvsignore:1.8 gnue/geas/src/.cvsignore:1.9
--- gnue/geas/src/.cvsignore:1.8        Mon Jun 11 15:23:32 2001
+++ gnue/geas/src/.cvsignore    Tue Jun 12 15:22:22 2001
@@ -7,7 +7,6 @@
 _libs
 *.o
 geas-server
-*.log
 geas.h
 geas-skels.*
 geas-common.*
@@ -15,3 +14,5 @@
 geas-skelimpl.h
 *.pid
 *.ior
+*.log
+geas.conf
Index: gnue/geas/src/Makefile.am
diff -u gnue/geas/src/Makefile.am:1.38 gnue/geas/src/Makefile.am:1.39
--- gnue/geas/src/Makefile.am:1.38      Tue Jun 12 12:20:32 2001
+++ gnue/geas/src/Makefile.am   Tue Jun 12 15:22:22 2001
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.38 2001/06/12 19:20:32 reinhard Exp $
+## $Id: Makefile.am,v 1.39 2001/06/12 22:22:22 reinhard Exp $
 
 SUBDIRS        = config objectstore oql objectcache methods datamonitor
 
@@ -83,15 +83,20 @@
 
 LST_FILES = postgresql.reserved.lst mysql.reserved.lst
 
+EXTRA_DIST = geas.conf.sample shadowpw-dist $(LST_FILES)
+
 pkgdata_DATA = $(LST_FILES)
 
-## ----------------------------------------------------------------------------
+geas.conf: geas.conf.sample
+       cp geas.conf.sample geas.conf
 
-EXTRA_DIST = geas.conf shadowpw-dist $(LST_FILES)
+noinst_DATA = geas.conf
 
 ## ----------------------------------------------------------------------------
 
 CLEANFILES = *.ior *.pid *.log
+## BUILT_SOURCES may not be cleaned. Subdirectories methods and objectcache
+## wouldn't compile any more afterwards.
 
 ## ----------------------------------------------------------------------------
 
@@ -122,3 +127,13 @@
        mv temp.x geas-skelimpl.h
        # remove the unneeded file
        rm geas-skelimpl.c
+
+## ----------------------------------------------------------------------------
+
+## FIXME: ORBit built sources should not be included in the distribution.
+## But sources in the subdirectories methods and objectcache depend on geas.h,
+## and they are compiled before this directory. So we must include geas.h
+## in the distribution. And it doesn't make sense to include geas.h but not
+## the other built sources.
+## dist-hook:
+##     cd ${distdir}; rm -f ${BUILT_SOURCES}