[svnbook commit] r1470 - trunk/src/nb

[sunny256]

Author: sunny256
Date: Sat Jun 18 20:35:03 2005
New Revision: 1470

Modified:
   trunk/src/nb/Makefile
Log:
Makefile tweaks in the Norwegian section. Add a check for differences 
from the English book.

* src/nb/Makefile
  (bookdiff): Add a diff(1) command to check for differences in the 
    English text between the English and Norwegian files. Before vimdiff 
    is started, the user has to press Enter.
  (sync): Add a missing -n to echo.


Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile	(original)
+++ trunk/src/nb/Makefile	Sat Jun 18 20:35:03 2005
@@ -63,8 +63,18 @@
 		cat $(BDTMP)/eng/$$_ptd | bin/clean_files -e >>$(BDTMP)/eng.txt; \
 		cat book/$$_ptd | bin/clean_files -e >>$(BDTMP)/norw.txt; \
 	done
-	vimdiff $(BDTMP)/norw.txt $(BDTMP)/eng.txt
+	@echo
+	@echo Checking files against the English version. If everything is fine,
+	@echo you should see only one line of output between the ===== lines.
+	@echo =====
+	@diff -du $(BDTMP)/eng.txt $(BDTMP)/norw.txt | grep ^-
+	@echo =====
+	@echo
 	@echo The temporary files are still in $(BDTMP)/ for you to play with.
+	@echo
+	@echo -n Press Enter to launch vimdiff or CTRL-C to exit...
+	@read
+	vimdiff $(BDTMP)/norw.txt $(BDTMP)/eng.txt
 
 sync:
 	mkdir sync.LOCK
@@ -72,7 +82,7 @@
 	@echo ======= START svn status =======
 	@svn status -q
 	@echo ======== END svn status ========
-	@echo If there are no local changes, press ENTER...
+	@echo -n If there are no local changes, press Enter...
 	@read
 	@if [ "$(HEAD)" = "" ]; then \
 		svnversion . | tr -d M >HEADREV; \