[Xfce4-commits] <xfce-git-migration:master> fix logfile names, allow overriding SVN_REPOS, no iconv on svn-authors

[Brian J. Tarricone]

Updating branch refs/heads/master
         to be9a569a689724b757e7ea3e18d809c2dbbc6356 (commit)
       from d6cfb8eec6b0eb3f45b5e558b11ae7c7a0a69153 (commit)

commit be9a569a689724b757e7ea3e18d809c2dbbc6356
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Wed Aug 12 01:35:49 2009 +0000

    fix logfile names, allow overriding SVN_REPOS, no iconv on svn-authors

 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3b239de..3e60e2a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CUR_PATH := $(shell pwd)
 USER_PROFILES_FILE := /etc/httpd/conf/auth/profiles
 VENDOR_SCRIPT := $(CUR_PATH)/vendor-script-xfce.sh
 SVN_ROOT_URI := file:///var/svn
-SVN_REPOS := \
+SVN_REPOS ?= \
 	xfce \
 	goodies \
 	www \
@@ -42,7 +42,7 @@ $(SVN_AUTHORS_STATIC_FIXED): $(SVN_AUTHORS_DYNAMIC) $(SVN_AUTHORS_STATIC)
 	        
 
 $(SVN_AUTHORS_DYNAMIC): $(USER_PROFILES_FILE)
-	iconv -f iso-8859-1 -t utf-8 < $< | sed -e 's/^\(.*\):\(.*\):\(.*\):\(.*\)$$/\1 = \2 \3 <\4>/' > $@
+	sed -e 's/^\(.*\):\(.*\):\(.*\):\(.*\)$$/\1 = \2 \3 <\4>/' $< > $@
 
 ifeq ($(MODULE)$(REPO),)
 
@@ -60,7 +60,7 @@ verify:
 	for r in $(SVN_REPOS); do \
 	    MODULES="$$(svn ls $(SVN_ROOT_URI)/$$r | $(MODULELIST_SED))"; \
 	    for m in $$MODULES; do \
-			make "REPO=$$r" MODULE="$$m" verify 2>&1 | tee $(LOGDIR)/verify-$$r-$#m.txt; \
+			make "REPO=$$r" MODULE="$$m" verify 2>&1 | tee $(LOGDIR)/verify-$$r-$$m.txt; \
 	    done; \
 	done