[lfs-fr] r6826 - branches/LFS_7.7_Systemd/tools

amj at linuxfromscratch.org amj at linuxfromscratch.org
Jeu 9 Avr 08:58:11 PDT 2015


Author: amj
Date: 2015-04-09 08:58:11 -0700 (Thu, 09 Apr 2015)
New Revision: 6826

Modified:
   branches/LFS_7.7_Systemd/tools/Makefile
Log:
correction makefile

Modified: branches/LFS_7.7_Systemd/tools/Makefile
===================================================================
--- branches/LFS_7.7_Systemd/tools/Makefile	2015-04-09 12:49:58 UTC (rev 6825)
+++ branches/LFS_7.7_Systemd/tools/Makefile	2015-04-09 15:58:11 UTC (rev 6826)
@@ -9,7 +9,7 @@
 version = 7.7-systemd
 diff_dir = diff
 
-filetocopy = images INSTALL obfuscate.sh pdf-fixups.sh README tidy.conf general.ent packages.ent patches.ent Makefile
+filetocopy = images/ INSTALL obfuscate.sh pdf-fixups.sh README tidy.conf general.ent packages.ent patches.ent Makefile
 
 XML1 = $(wildcard $(LANG1)/*.xml) $(wildcard $(LANG1)/**/*.xml)
 PO = $(wildcard $(PO_dir)/*.po) $(wildcard $(PO_dir)/**/*.po)
@@ -35,7 +35,7 @@
 stylesheets:
 	svn co $(stylesheets)
 
-init: getpo stylesheets
+init: getpo stylesheets $(LANG1)
 
 updpo:
 	svn update $(PO_dir)/
@@ -55,12 +55,11 @@
 
 
 addfiles: $(LANG1)
+	if ![ -e $(sourcegen) ]; then mkdir -p $(sourcegen);fi
 	for a in $(filetocopy); do cp -r "$(LANG1)/$$a"  $(sourcegen)/ ;done
 	cp -r "stylesheets" $(sourcegen)/
 
 appsed:  addfiles
-
-
 	sed -e "s/$(date1)/$(date2)/g"\
 	    -e "s/Approximate build time/Temps de construction approximatif/g"\
 	    -e "s/Required disk space/Espace disque requis/g"\
@@ -71,7 +70,6 @@
 	    -e "s/&lfs-root;blfs\//http:\/\/www.fr.linuxfromscratch.org\/view\/blfs-$(version)/g"\
 	    -e "s/&lfs-root;hints\/downloads\/files\//http:\/\/www.fr.linuxfromscratch.org\/view\/astuces\//g"\
 	    -i $(sourcegen)/general.ent
-
 	sed -e "s/KB/Ko/g" -e "s/MB/Mo/g" -e "s/GB/Go/g"\
 	    -e "s/less than/moins de/g"\
 	    -e "s/typically about/en général environ/g"\
@@ -78,19 +76,16 @@
 	    -e "s/about/environ/g"\
 	    -e "s/with tests/avec les tests/g"\
 	    -i $(sourcegen)/packages.ent
-	
 	sed -e "s/KB/Ko/g"  -i $(sourcegen)/patches.ent
-	sed -e "s/<book>/<book lang=\"fr\">/g"  -i $(sourcegen)/index.xml
 	sed -e "s/latin1/UTF8/g" -i $(sourcegen)/tidy.conf
-	
-	
+
+appsed2: $(XMLGEN) 
+	echo $(XMLGEN)
+	sed -e "s/<book>/<book lang=\"fr\">/g"  -i $(sourcegen)/index.xml	
 	for f in $(XMLGEN); do sed -e "s/encoding=\"ISO-8859-1\"/encoding=\"UTF-8\"/g" -i $$f ; done
 
-validatexml:
-	cd $(sourcegen) ; make validate
+gensource: updpo sourcegenclean genxml appsed appsed2
 
-gensource: updpo sourcegenclean genxml appsed validatexml
-
 genhtml: gensource
 	if [ -e ./html ]; then rm -r ./html; fi
 	cd $(sourcegen) ; make BASEDIR=../html



Plus d'informations sur la liste de diffusion lfs-traducfr