trans-coord/gnun/prep/gnun ChangeLog GNUmakefile

[Yavor Doganov]

CVSROOT:        /cvsroot/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/01/29 18:45:42

Modified files:
        gnun/prep/gnun : ChangeLog GNUmakefile 

Log message:
        (MV, TOUCH): Delete and invoke the programs
        directly.  All uses changed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/ChangeLog?cvsroot=trans-coord&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/prep/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/prep/gnun/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- ChangeLog   29 Jan 2008 10:50:20 -0000      1.15
+++ ChangeLog   29 Jan 2008 18:45:42 -0000      1.16
@@ -1,3 +1,8 @@
+2008-01-29  Yavor Doganov  <address@hidden>
+
+       * GNUmakefile (MV, TOUCH): Delete and invoke the programs
+       directly.  All uses changed.
+
 2008-01-29  Kaloian Doganov  <address@hidden>
 
        * make-prototype:

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/trans-coord/trans-coord/gnun/prep/gnun/GNUmakefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- GNUmakefile 29 Jan 2008 10:50:20 -0000      1.17
+++ GNUmakefile 29 Jan 2008 18:45:42 -0000      1.18
@@ -21,8 +21,6 @@
 MAKE-PROTOTYPE = ./make-prototype
 SED = sed
 M4 = m4
-TOUCH = touch
-MV = mv
 
 PO4A-GETTEXTIZEFLAGS =
 PO4A-TRANSLATEFLAGS = --keep=0
@@ -85,7 +83,7 @@
 
 # The command to add a file to the repository.
 define addfile
-[ -f $@ ] || ($(TOUCH) $@ ; $(CVS) $(CVSOPTS) add $@)
+[ -f $@ ] || (touch $@ ; $(CVS) $(CVSOPTS) add $@)
 endef
 
 # The command to generate pot file which perform additional checks
@@ -94,8 +92,8 @@
 define generate-pot
 @echo Generating POT...
 $(PO4A-GETTEXTIZE) $(PO4A_XHTMLFLAGS) $(PO4A-GETTEXTIZEFLAGS) --master $< --po 
address@hidden
-if ([ ! -f $@ ] || [ "`diff -U 0 $@ address@hidden | grep -v 
"^\(---\|+++\|@@\)" | grep -v '^[-+]"POT-Creation-Date:' | wc -c`" -ne 0 ]); 
then $(MV) address@hidden $@ ; fi;
-$(TOUCH) $@
+if ([ ! -f $@ ] || [ "`diff -U 0 $@ address@hidden | grep -v 
"^\(---\|+++\|@@\)" | grep -v '^[-+]"POT-Creation-Date:' | wc -c`" -ne 0 ]); 
then mv address@hidden $@ ; fi;
+touch $@
 $(RM) address@hidden
 endef
 
@@ -118,7 +116,7 @@
 define template_rules
 $(template_dir)/po/%.$(1).po: $(template_dir)/po/%.pot
        @echo Updating PO file...
-       $(MSGMERGE) --update $$@ $$< && $(TOUCH) $$@
+       $(MSGMERGE) --update $$@ $$< && touch $$@
 
 $(template_dir)/%.$(1).html: $(template_dir)/%.html 
$(template_dir)/po/%.$(1).po
        $$(addfile)
@@ -147,7 +145,7 @@
 define home_rules
 $(rootdir)/po/home.$(1).po: $(rootdir)/po/home.pot
        $(MSGMERGE) --update $$@ $$<
-       $(TOUCH) $$@
+       touch $$@
 
 $(rootdir)/home.$(1).shtml: $(rootdir)/po/home.proto 
$(rootdir)/po/home.$(1).po generic.$(1).html
        $$(addfile)
@@ -187,7 +185,7 @@
 define article_rules
 $(1).po: $(basename $(1)).pot
        $(MSGMERGE) --update $$@ $$<
-       $(TOUCH) $$@
+       touch $$@
 
 $(subst /po/,/,$(1).html): $(basename $(1)).proto $(basename $(1)).translinks 
$(1).po generic.$(2).html
        $$(addfile)