[csw-devel] SF.net SVN: gar:[9906] csw/mgar/pkg/phpldapadmin/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 9906
          http://gar.svn.sourceforge.net/gar/?rev=9906&view=rev
Author:   dmichelsen
Date:     2010-05-17 12:35:56 +0000 (Mon, 17 May 2010)

Log Message:
-----------
phpldapadmin: Remove double .CSW on config file to fix #4419

Modified Paths:
--------------
    csw/mgar/pkg/phpldapadmin/trunk/Makefile

Modified: csw/mgar/pkg/phpldapadmin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/phpldapadmin/trunk/Makefile	2010-05-17 11:26:05 UTC (rev 9905)
+++ csw/mgar/pkg/phpldapadmin/trunk/Makefile	2010-05-17 12:35:56 UTC (rev 9906)
@@ -28,7 +28,7 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-PRESERVECONF = $(sharedstatedir)/www/phpldapadmin/config/config.php.CSW
+PRESERVECONF = $(sharedstatedir)/www/phpldapadmin/config/config.php
 
 LICENSE = LICENSE
 ARCHALL = 1
@@ -41,8 +41,9 @@
 	@ginstall -d $(DESTDIR)$(sharedstatedir)/www
 	@cp -R $(WORKSRC) $(DESTDIR)$(sharedstatedir)/www/phpldapadmin
 	@(cd $(DESTDIR)$(sharedstatedir)/www/phpldapadmin/config; \
-		mv config.php.example config.php.CSW)
+		mv config.php.example config.php)
 	@find $(DESTDIR)$(sharedstatedir) -name .cvsignore -exec rm \{\} \;
+	@find $(DESTDIR)$(sharedstatedir) -name .gitignore -exec rm \{\} \;
 	@rm -rf $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin
 	@ginstall -d $(DESTDIR)$(prefix)/apache2/share/htdocs
 	@ln -s $(sharedstatedir)/www/phpldapadmin/htdocs $(DESTDIR)$(prefix)/apache2/share/htdocs/phpldapadmin


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.