[CalendarServer-changes] [13390] CalendarServer/trunk/support/Apple.make

[source_changes at macosforge.org]

Revision: 13390
          http://trac.calendarserver.org//changeset/13390
Author:   wsanchez at apple.com
Date:     2014-05-01 16:46:26 -0700 (Thu, 01 May 2014)
Log Message:
-----------
Install config into the right place

Modified Paths:
--------------
    CalendarServer/trunk/support/Apple.make

Modified: CalendarServer/trunk/support/Apple.make
===================================================================
--- CalendarServer/trunk/support/Apple.make	2014-05-01 22:10:25 UTC (rev 13389)
+++ CalendarServer/trunk/support/Apple.make	2014-05-01 23:46:26 UTC (rev 13390)
@@ -121,9 +121,12 @@
 	$(_v) $(FIND) "$(DSTROOT)$(CS_VIRTUALENV)" -type d -name .svn -print0 | xargs -0 rm -rf;
 	$(_v) $(FIND) "$(DSTROOT)$(CS_VIRTUALENV)" -type f -name '*.so' -print0 | xargs -0 $(STRIP) -Sx;
 	$(_v) $(FIND) "$(DSTROOT)$(CS_VIRTUALENV)" -type f -size 0 -exec sh -c 'printf "# empty\n" > {}' ";";
-	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(CS_VIRTUALENV)/etc";
-	$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(CS_VIRTUALENV)/etc/caldavd.plist";
 
+install:: install-config
+install-config::
+	$(_v) $(INSTALL_DIRECTORY) "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)"
+	$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(SIPP)$(ETCDIR)$(CALDAVDSUBDIR)/caldavd-apple.plist"
+
 install:: install-commands
 install-commands::
 	@echo "Installing links to executables...";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140501/32c6b403/attachment.html>