CVS: phpwiki Makefile,1.5,1.6

Update of /cvsroot/phpwiki/phpwiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11769

Modified Files:
        Makefile 
Log Message:
updated etags, new schemas

Index: Makefile
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -2 -b -p -d -r1.5 -r1.6
--- Makefile    1 Jul 2004 08:15:10 -0000       1.5
+++ Makefile    6 Sep 2004 08:21:35 -0000       1.6
@@ -32,5 +32,5 @@ ifeq (${PROCESS_DSN},1)
   #DB_PASS=
   DB_PASS := $(word 4,${DATABASE_DSN})
-
+  #Todo: read optional DBADMIN_USER and DBADMIN_PASS settings from config.ini
   DBADMIN_OPTS=-u$(DBADMIN_USER) -p$(DBADMIN_PASS)
 else
@@ -48,9 +48,11 @@ TAGS:  $(PHP_SRC)
 #      etags $(PHP_SRC)
        if [ -f $@ ]; then /usr/bin/mv -f $@ $@~; fi
-       /usr/bin/find . \( -type d -regex 
'\(^\./lib/pear\)\|\(^\./lib/WikiDB/adodb\)\|\(^\./lib/nusoap\)\|\(^\./lib/fpdf\)\|\(^\./locale/.*/LC_MESSAGES\)'
 \) -prune -o -name \*.php | etags -L -
+       /usr/bin/find . \( -type d -regex 
'\(^\./lib/pear\)\|\(^\./lib/WikiDB/adodb\)\|\(^\./lib/nusoap\)\|\(^\./lib/fpdf\)\|\(^\./locale/.*/LC_MESSAGES\)'
 \) -prune -o -name \*.php | etags -
 
 TAGS.full:  $(PHP_SRC)
        if [ -f $@ ]; then /usr/bin/mv -f $@ $@~; fi
-       /usr/bin/find . -name \*.php -o -name \*.tmpl | etags -L - 
--langmap="HTML:.tmpl" -f $@;
+#      better etags
+#      /usr/bin/find . -name \*.php -o -name \*.tmpl | etags -L - 
--langmap="HTML:.tmpl" -f $@
+       /usr/bin/find . -name \*.php -o -name \*.tmpl | etags - -o $@
 
 locale: 
@@ -86,5 +88,5 @@ mysql:
        mysql $(DB_OPTS) -e "GRANT select,insert,update,delete,lock tables ON 
$(DB_DB).* \
 TO $(DB_USER)@localhost IDENTIFIED BY '$(DB_PASS)';"
-       mysql $(DB_OPTS) $(DB_DB) < schemas/mysql.sql
+       mysql $(DB_OPTS) $(DB_DB) < schemas/mysql-initialize.sql
 
 # initialize the database
@@ -97,10 +99,10 @@ pqsql:
          createuser -D -A $(DB_USER)
        endif
-       psql $(DB_DB) -f schemas/psql.sql
+       psql $(DB_DB) -f schemas/psql-initialize.sql
        logout
 
 # initialize the database
 sqlite:        $(DB_SQLITE_DBFILE)
-       sqlite $(DB_SQLITE_DBFILE) < schemas/sqlite.sql
+       sqlite $(DB_SQLITE_DBFILE) < schemas/sqlite-initialize.sql
 
 # update the database



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click