Revision: 23702
http://sourceforge.net/p/gar/code/23702
Author: dmichelsen
Date: 2014-05-26 12:00:38 +0000 (Mon, 26 May 2014)
Log Message:
-----------
websvn/trunk: Really preserve config
Modified Paths:
--------------
csw/mgar/pkg/websvn/trunk/Makefile
Modified: csw/mgar/pkg/websvn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/websvn/trunk/Makefile 2014-05-26 11:50:30 UTC (rev 23701)
+++ csw/mgar/pkg/websvn/trunk/Makefile 2014-05-26 12:00:38 UTC (rev 23702)
@@ -43,9 +43,9 @@
TEST_SCRIPTS =
INSTALL_SCRIPTS = custom
-EXTRA_PAX_ARGS += -s ',^\.\(.*\)/distconfig.php$$,.\1/config.php,'
+EXTRA_PAX_ARGS += -s ',^\.\(.*\)/distconfig.php$$,.\1/config.php.CSW,'
-PRESERVECONF = $(sharedstatedir)/www/websvn/include/config.php
+PRESERVECONF += $(sharedstatedir)/www/websvn/htdocs/include/config.php
ARCHALL = 1
@@ -53,11 +53,12 @@
install-custom:
@echo " ==> Installing $(NAME)"
- @rm -rf $(DESTDIR)$(sharedstatedir)/www/websvn
- @ginstall -d $(DESTDIR)$(sharedstatedir)/www/websvn
- @cp -rp $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/websvn/htdocs
- @find $(DESTDIR)$(prefix) -name .svn -exec rm -rf \{\} \;
- @find $(DESTDIR)$(prefix) -name .git -exec rm -rf \{\} \;
- @rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn
- @ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs
- @ln -s $(sharedstatedir)/www/websvn/htdocs
$(DESTDIR)$(prefix)/apache2/share/htdocs/websvn
+ rm -rf $(DESTDIR)$(sharedstatedir)/www/websvn
+ ginstall -d $(DESTDIR)$(sharedstatedir)/www/websvn
+ cp -rp $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/websvn/htdocs
+ find $(DESTDIR)$(prefix) -name .svn -exec rm -rf \{\} \;
+ find $(DESTDIR)$(prefix) -name .git -exec rm -rf \{\} \;
+ rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/websvn
+ ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs
+ ln -s $(sharedstatedir)/www/websvn/htdocs
$(DESTDIR)$(prefix)/apache2/share/htdocs/websvn
+ @$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
