From b08e8f0550c29e060425d127750b513e9eb1cd2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Mar 2005 22:06:23 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Les=20makefiles=20g=E9n=E9rent=20un=20fi?= =?UTF-8?q?chier=20sql=20qui=20doit=20contenir=20la=20cr=E9ation=20des=20c?= =?UTF-8?q?l=E9s=20apr=E8s=20la=20cr=E9ation=20de=20toute=20les=20tables.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mysql/Makefile | 7 ++++--- pgsql/Makefile | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mysql/Makefile b/mysql/Makefile index 7765f8be122..db7df817c93 100644 --- a/mysql/Makefile +++ b/mysql/Makefile @@ -41,8 +41,8 @@ SQL=mysql BASE=dolibarr OPTIONS= -FIND=find -#FIND="c:/Program files/cygwin/bin/find" +#FIND=find +FIND="c:/Program files/cygwin/bin/find" TABLES=$(shell $(FIND) tables/ -name "*sql") @@ -111,5 +111,6 @@ mysql.sql: $(TABLES) data/data.sql Makefile echo "-- Fichier généré par make mysql.sql" > mysql.sql echo "-- Contient les ordres de creation des tables + les clés + les données" >> mysql.sql echo "-- ;" >> mysql.sql - $(FIND) tables/ -name "*sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> mysql.sql + $(FIND) tables/ -name "*sql" | grep -v "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> mysql.sql + $(FIND) tables/ -name "*sql" | grep "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> mysql.sql cat data/data.sql | grep -v ^-- >> mysql.sql diff --git a/pgsql/Makefile b/pgsql/Makefile index 51780abc26a..3c1b74226a4 100644 --- a/pgsql/Makefile +++ b/pgsql/Makefile @@ -104,5 +104,6 @@ pgsql.sql: $(TABLES) data/data.sql Makefile echo "-- Fichier généré par make pgsql.sql" > pgsql.sql echo "-- Contient les ordres de creation des tables + les clés + les données" >> pgsql.sql echo "-- ;" >> pgsql.sql - $(FIND) tables/ -name "*sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> pgsql.sql + $(FIND) tables/ -name "*sql" | grep -v "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> pgsql.sql + $(FIND) tables/ -name "*sql" | grep "key.sql" | xargs cat | grep -v "^--" | cut -d "-" -f 1 >> pgsql.sql cat data/data.sql | grep -v ^-- >> pgsql.sql