trans-coord/gnun/server/gnun GNUmakefile ChangeLog

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       13/01/13 15:31:24

Modified files:
        gnun/server/gnun: GNUmakefile ChangeLog 

Log message:
        Don't let gnun.mk and priorities.mk override variables defined
        in GNUmakefile.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.148&r2=1.149
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.344&r2=1.345

Patches:
Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- GNUmakefile 18 Dec 2012 18:43:32 -0000      1.148
+++ GNUmakefile 13 Jan 2013 15:31:24 -0000      1.149
@@ -27,6 +27,14 @@
 
 include config.mk
 
+rootdir := ../..
+
+include gnun.mk
+
+ifdef TEAM
+-include priorities.mk
+endif
+
 VALIDATE-HTML-NOTIFY := $(pkglibexecdir)/validate-html-notify
 MAILFAIL := $(pkglibexecdir)/mailfail
 MAKE-PROTOTYPE := $(AWK) -f $(pkglibexecdir)/make-prototype.awk
@@ -89,10 +97,6 @@
 NOTIFYSKIP := --dry-run
 endif
 
-rootdir := ../..
-
-include gnun.mk
-
 # FIXME: footer-short and footer-min are remnants from the old-new
 # design; they should go at some point.
 localized-includes := server/header server/head-include-1 \
@@ -1107,7 +1111,6 @@
 
 # Assign priorities to translations for report.
 ifdef TEAM
--include priorities.mk
 TEAM-POS := $(sort $(filter %.${TEAM}.po,${ALL_POS}))
 # UnGNUNified translations
 TEAM-HTMLS := $(shell echo $(subst /po/,/,$(ALL_POTS:%.pot=%.$(TEAM).html)) \

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -b -r1.344 -r1.345
--- ChangeLog   10 Jan 2013 10:53:38 -0000      1.344
+++ ChangeLog   13 Jan 2013 15:31:24 -0000      1.345
@@ -1,3 +1,8 @@
+2013-01-13  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile: Don't let gnun.mk and priorities.mk override
+       variables defined in GNUmakefile.
+
 2013-01-10  Pavel Kharitonov  <address@hidden>
 
        * GNUmakefile.team (merge-file, sync-file): Propagate new