X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=git-daemon%2FMakefile;h=ad8dd782ec8cef4863cc874a92dd09c52195b149;hb=c6106de89f45eeb5f684ccfb2627d6259b1f881b;hp=2d24274af9ae26b2346b7fbffe1b18281938b1b8;hpb=d36c5f7baf4f11c7d6765afac2f5fb9449b0e0a7;p=userv-utils.git

diff --git a/git-daemon/Makefile b/git-daemon/Makefile
index 2d24274..ad8dd78 100644
--- a/git-daemon/Makefile
+++ b/git-daemon/Makefile
@@ -7,16 +7,23 @@
 
 include ../settings.make
 
-TARGETS=	git-upload-pack inetd.conf git-daemon git-service
+gituser=	git
+varloggit=	$(varlog)/git
 
-SUBSTVARS=	libuserv etcuserv
+TARGETS=	git-upload-pack inetd.conf git-daemon git-service logrotate
+
+SUBSTVARS=	libuserv etcuserv varloggit gituser
+
+CONFIGS=	$(services)/git-upload-pack \
+		$(etcuserv)/git-urlmap \
+		$(etcdir)/logrotate.d/userv-git-daemon
 
 all:		$(TARGETS)
 
-sedscript:	Makefile
+sedscript:	Makefile read-urlmap
 		echo >$@.new '$(foreach f, $(SUBSTVARS), s,@$f@,$($f),g; )'
 		echo >>$@.new '/@@READ_URLMAP@@/c\'
-		perl >>$@.new -pe 's/$$/\\/' <read-urlmap
+		perl >>$@.new -pe 's/\\/\\\\/g; s/$$/\\/' <read-urlmap
 		mv -f $@.new $@
 
 %:		%.in sedscript
@@ -26,10 +33,17 @@ sedscript:	Makefile
 		mv -f $@.new $@
 
 install:	all
-		mkdir -p $(libuserv) $(etcuserv) $(services)
+		mkdir -p $(libuserv) $(etcuserv) $(services) \
+			$(etcdir)/logrotate.d
+		install -d -o $(gituser) -g adm $(varloggit)
 		cp git-daemon git-service $(libuserv)
-		cp git-upload-pack $(services)
-		cp git-urlmap $(etcuserv)
+		cp git-upload-pack $(services)/git-upload-pack:new
+		cp git-urlmap $(etcuserv)/git-urlmap:new
+		cp logrotate $(etcdir)/logrotate.d/userv-git-daemon:new
+		set -e; for f in $(CONFIGS); do \
+			if test -f $$f; then continue; fi; \
+			mv $$f:new $$f; \
+		done
 
 clean:
 		rm -f $(TARGETS)